Vault Says Files Need Merging, Yet Merge Tools Say Identical

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear

Locked
JDIMS
Posts: 6
Joined: Thu Apr 13, 2006 6:26 am

Vault Says Files Need Merging, Yet Merge Tools Say Identical

Post by JDIMS » Wed Aug 16, 2006 4:28 pm

Configuration: VS.NET (VB.NET + ASP.NET) 2003, Servers and workstations all run Windows Server 2003. Vault version = 3.1.8.

We have, enough times that we can't ignore it any more, seen Vault say that files need to be merged, yet the merge tools show the files to be identical.

What would cause this, and how can we avoid it. Then, come build & deploy time, we won't get bogged down chasing what seem to be phantom problems. We have tried to think of a cause (configuration of some kind) but come up blank.

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Post by Beth » Thu Aug 17, 2006 7:47 am

The way the merge tool works is that Vault will not allow you to check in a file if your modifications to that file were not based on the most recent version of that file. It doesn't look to see if any actual changes are made.

Is there any chance that the cached files are being removed? That would automatically make Vault think the files need merge. You might want to check your history on some of those files to see if anything is being done that you don't know about, or try a test with the require exclusive lock set to see if the same thing happens.

In this posting Eric explains how the merge works in further detail: http://support.sourcegear.com/viewtopic ... erge+match

Locked