[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: Sat, 26 Jul 2008 20:56:56 +0200

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.

Stefan

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

Received on 2008-07-26 20:57:17 CEST

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