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

Diff with URL: tortoiseMerge

From: Christophe Royer <chroyer_at_comcast.net>
Date: Thu, 17 Sep 2009 10:54:28 -0700

I have TSVN 1.6.5 build 17020, 32 bits
I am trying to use "Diff with URL", but I am surprised by the output. Here is the scenario:

I start with a WC up to date and I add a few lines locally to a bunch of files (using a script). Before I commit, I want an easy way to see all my local changes. So I shift-right click in Windows Explorer and choose "Diff with URL". I make sure that the URL displayed is the URL where my WC comes from. In the main window of TortoiseMege, this is what I see:
    "Theirs" file shows up with my added lines highlited and the "=" line status icon
    "Mine" file shows the same thing: highlited and the "=" line status icon
    The merged files shows my new lines and the "+" line status icon

I expected "theirs" file to show blank lines (with no status icon), and "Mine" file to show the plus sign next to the lines I added (just like I see when I do a regular diff on a specific file)

Can someone
    tell me if there is a defect or if I misuse/misunderstand that feature?
     suggest another way to easily see the differences (but not in unified diff forms) when many files are involved?




To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-17 20:15:05 CEST

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.