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

Re: Bug with TortoiseMerge?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 11 Jun 2010 13:29:28 +0200

On 11.06.2010 02:12, Ashvin Narayanan wrote:
> I've attached an image to better explain my situation. Just to be
> clear, I haven't committed any of my working files. They differ from
> the files in the base, which themselves differ from the older
> revision I want to compare with.

You're seeing a diff between r5523, BASE (the revision you committed the
file last) and your working copy.

Top left (theirs): diff between r5523 and BASE.
Top right (mine) : diff between your working copy and BASE (i.e., your
local modifications)
Bottom (merged) : The resulting merge of r5523 and your local mods
against BASE.

The orange lines (the ones with the strike through font) are the ones
that got removed, the yellow ones are those which got added. Usually the
orange ones got replaced with the yellow ones. You can also see that in
the icons shown left of the line numbers.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-11 13:29:43 CEST

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