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

Re: How to read 3-way differences in TortoiseMerge?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 23 Jul 2008 22:40:44 +0100

2008/7/23 Stefan Küng <tortoisesvn_at_gmail.com>:
> Robert Dailey wrote:
>>
>> On Wed, Jul 23, 2008 at 11:38 AM, Stefan Küng <tortoisesvn_at_gmail.com
>> <mailto:tortoisesvn_at_gmail.com>> wrote:
>>
>> Robert Dailey wrote:
>>
>> Hi,
>>
>> When I do an SVN Update, I notice a few items that are "Merged"
>> (green). I right click these and go to "Compare with Working
>> Copy" because I'm interested in seeing *what was merged into
>> what I already have*. However, I end up getting horribly
>> confused because it's not showing me anything useful. I have no
>> idea how to read the differences. What is it comparing against?
>>
>>
>> It shows you on the top left the file from the repository, compared
>> against BASE. On the right, you see your file (with your local
>> modifications) compared against BASE.
>> And on the bottom, you see the merged result, compared against BASE.
>>
>>
>> What version from the repository is being compared against base in the
>> top-left window? I noticed changes in there that were from a few revisions
>> back from what I actually got during this particular update. What two files
>> are being merged in the bottom pane?
>
> The revision from the repository is the last-commit-rev of the item you've
> updated (usually the parent folder).
>
> the bottom pane shows the merge result of the file in the repository and
> BASE.

I sometimes wondered why the diff there shows many more changes than I
was expecting. What I would hope to see is the 3-way diff between BASE
as it was before the merge, my local changes and BASE as it is now
after the update. I guess the information about the previous BASE is
lost as part of the update :-(

Since the parent folder will change its commit rev very infrequently
(prop changes?) then the 3-way diff seems practically useless.

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-23 23:41:08 CEST

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