[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 28 Jul 2008 16:55:57 +0200

Robert Dailey wrote:

> 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).

You will see that, but only if you did an update after you've last
committed the now merged file.

> 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.

The same here: if you have updated after you last committed that file,
you will get the merge view with the correct revisions.

> Perhaps my expectations are incorrect? What was the reason behind how it
> behaves now? What is it meant to satisfy?

TSVN does not know which files are affected in an update *before* the
actual update. But after the update has finished, it can't check what
revision the file was at in the working copy before the update to show
you the diff you would expect.
So the only workaround is to get the revision the folder you run the
update on has in the working copy before the update.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-28 16:56:18 CEST

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