Help Please (-: Status "Needs Merge"

[freakydiver]

Here is the scenario - I have an automated build script to build out a .net solution. The automated build script is checked into Vault. When it builds, the first step is to check itself out. It builds and if successful, I increment a release number within the build script. I then check this back into Vault with the intention of obviously keeping the changes that occured in the build script.

Every time the file checks in and I go to the Vault client ide, a status of "needs merge" is always listed and the remote version increases while the local one never does. Why is this? I have tried setting merge to Automatic, Later, Default and Automatic. I think those only apply go check out anyhow. I have "commit" selected on the check in. Please help (-:

[Beth]

My initial thought is that someone else may have made a modification without your knowledge. That would show up in your history.

On your script, you could perform a get before doing anything else and that should help.

Are you using Exclusive Locks?

In the client, under Tools-Options-Concurrent Development Style, you can also set the Require Check Out Before Check In, and that may help prevent you running into this.

[freakydiver]

OK - I figured it out, user error. What was confusing me is that the "local version" was always less than the "remote version" listed in the vault client. I mistakenly assumed that the remote version was the one in on my local drive, but it is really the one in Vault. Since I do a get on the file in question everytime, I should be good to go...

PS - I am the only one in the Vault instance so no one else could possibly make any changes. Also - the very first step in my automated build script is to do a Get, in fact, I added a step after the second to last step (the check in of the script) to do another Get. The version numbers are still off. I do have exclusive locks and comments required turned on...