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

Re: I don't understand the TortoiseMerge symbols ...

From: Andy Levy <andy.levy_at_gmail.com>
Date: Thu, 27 Nov 2008 07:55:08 -0500

On Thu, Nov 27, 2008 at 04:27, Mark Riemann <Mark.Riemann_at_gmx.de> wrote:
> Hello,
>
> I compare my working copy with the original in my repository and the
> TortoiseMerge tool shows a line with "-" on the original file and "+" on my
> working copy. The only thing that I have changed was the comment in the end
> of the line.
>
> Is it possible i have missunderstood the tool?
>
> In the help I can read the following:
> "-" a line was deleted
> "+" a line was added
>
> I don't have added or deleted any lines. I have only changed a line.
>
> Why doesn't will the differences marked in red or any other color (see the
> buttom lines in [1]) and why is the background color different from the
> middle one in [1]?

Diff is done in a line by line context. So, you have deleted the old
line, and put the new one in its place as far as diff is concerned. If
you run svn diff on the command line you'll see the same.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-27 13:55:13 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.