[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Comparing two nodes after a merge

From: Rick Kwitkoski <RKwitkoski_at_BCLC.com>
Date: Fri, 11 Feb 2011 11:30:50 -0800

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

This email is intended only for the addressee. It may contain confidential or proprietary information that cannot be disclosed without BCLC's permission. If you have received this email in error, please notify the sender immediately and delete the email.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-11 20:32:19 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.