[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: Wed, 23 Jul 2008 22:16:09 +0200

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.

Stefan

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

Received on 2008-07-23 22:16:29 CEST

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