Follow up on Merge problem with version 2.0.3

[Pierre Dumont]

Since i can't post in the Gold section for now i would like to know if there is a follow up for this message.

http://support.sourcegear.com/viewtopic.php?t=1536

Seem the problem was with version 2.0.3. I want to know if it's fix in version 2.0.5.

We have a huge problem with merging the files. Some are overwritten and no messages are left by the system.

Thanks

[dan]

Since i can't post in the Gold section for now i would like to know if there is a follow up for this message.

http://support.sourcegear.com/viewtopic.php?t=1536

Seem the problem was with version 2.0.3. I want to know if it's fix in version 2.0.5.

We have a huge problem with merging the files. Some are overwritten and no messages are left by the system.

Thanks

In the other thread, that user was hand copying an older version of a file to a working folder where Vault expected it to be the most recent version, and the merge did not work as they thought it should, even though Vault was performing as it should.

I'll need more details on what you are seeing to know if you are doing the same type of thing.

[Pierre Dumont]

OK it's probably my understanding of english.

I was sure he had a problem and the copy of a different file was only for testing the problem.

The problem we have is from time to time our file are overwritten when checking in a file instead or merging.

[dan]

Some questions and comments:

Can you reproduce the problem in a reliable way?

Is the file being overwritten with an older version on the client, or is it that the local version is overwriting someone else's changes on the server?

Is the status of the file "Needs Merge" prior to checkin, or does the file say "Edited", but there is a newer version on the server that the client machine does not have yet?

Note that it is possible to manually invoke the "Resolve Merge Status" command without actually merging the file, in which case the changes will appear to be overwritten on the server.