[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: Robert Dailey <rcdailey_at_gmail.com>
Date: Sat, 26 Jul 2008 18:04:26 -0500

On Sat, Jul 26, 2008 at 1:56 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:

> Robert Dailey wrote:
>
> Say we have a file named foo.cpp that has 3 commit revisions (In other
>> words, I committed the file 3 times and each commit resulted in the
>> corresponding revision number): 10 29 48
>>
>> When I do an update that gives me foo.cpp at revision 48, are you saying
>> that it will diff the changes between 29 and 48 in the top-left pane? If
>> this is so, why am I seeing changes that should only be showing up when I
>> diff between 10 & 29?
>>
>
> No, it will show you (most likely) the diff between 10 & 48. Because it
> will use the revision of the directory before the update, and that's most
> likely your revision 10 if you haven't updated in between.
> This feature of course only works 'good' if you update your working copy
> often.

Help me understand exactly how this is useful. First of all, when I see
something has "Merged" during an update, when I Diff that I would expect to
see the difference between the latest version of that file and the revision
right before it (So I can see exactly what was changed). However, if the
Merge happens and it includes several revisions, I would expect to see a
difference then between the last updated version I had and the head
revision. Note in all of this I do not care about seeing my own local
working copy changes in the Diff.

Perhaps my expectations are incorrect? What was the reason behind how it
behaves now? What is it meant to satisfy?
Received on 2008-07-27 01:04:37 CEST

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