RE: Comparing two nodes after a merge

> When I merge from one branch to another, say for a branch re-
> integration, and subsequently do a comparison of the branch node to
> the new main node by a comparison of the two nodes from the
> revision graph, I would hope to see that they are the same. The
> comparison shows that I have a large series of MODIFIED files.
>
> If I checkout both branches to working copies and compare the
> working copy folders (I use Beyond Compare) there are no
> differences, which is what I expect.
>
> Does the MODIFIED files designation between the two nodes mean
> something different? If I compare any specific file in that list,
> Tortoise Compare shows no difference.
> Thanks.
>
> Rick Kwitkoski

You are probably seeing MODIFIED due to properties changed on the files... most likely svn:mergeinfo addition/change/elision.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2703467

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-11 21:12:08 CET