Imperfect Merge

vrapp · Post by **vrapp** » Fri Nov 10, 2006 2:24 pm

Hello,

the following picture shows the Compare/Merge window; if you look, it's clear that the comparison does not do good job in suggesting what to replace.

It should only suggest to insert lines 25 and 33 from the left panel, and probably this could be accomplished automatically. Why is it showing the whole big yellow block where all but those 2 lines are equal?

Thanks,
Vadim Rapp

Beth · Post by **Beth** » Fri Nov 10, 2006 4:14 pm

What you have depicted here could happen if you and another user both edited the same area. Vault just knows that there were changes made to that area; it doesn't analyze if two people made the same or similar changes.

One way to find out how this happened is to find the baseline of the file that you started from and view (but don't get) that file from history. Mostly likely it will match what is in the center pain. What's in the repository I suspect was checked in by another user, right?

vrapp · Post by **vrapp** » Wed Nov 15, 2006 9:17 am

(sorry for the late reply). No, I'm the only user.

Beth · Post by **Beth** » Wed Nov 15, 2006 11:54 am

Did you check out your baseline of the file from history??

vrapp · Post by **vrapp** » Wed Nov 15, 2006 12:14 pm

What's in the folder _sgback indeed matches the center pane. But the last version in the database matches the right pane, since 2005.

Beth · Post by **Beth** » Wed Nov 15, 2006 1:11 pm

A file gets copied to the _sgback when the file in the working folder is overwritten. And you say the file you pulled down was the same as the file on the right. It does sound like something is confused to where it at least thinks you re-added all those lines. I wouldn't say it's a bug unless it's reproducable which I haven't been able to do yet. It could be a case of where your client-side cache got out of sync somehow with the server. In that case you only need to clear your client-side cache to make Vault rebuild it: http://support.sourcegear.com/viewtopic.php?t=6. If you had something that old still on your system, then I'd say to clear the cache once anyway to clear out old information.

If this continues to happen, let me know.