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

Re: Diff with URL: tortoiseMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 18 Sep 2009 19:11:48 +0200

On 17.09.2009 19:54, Christophe Royer wrote:
> Hi,
> 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?

If you get the three pane view in TMerge, that means that the file in
the repository (the url you chose to compare with) isn't the same as the
unmodified file in your working copy.

I just tried this with a file in the TSVN working copy: it shows the
proper two-way diff since I know it hasn't changed in the repository.
I only get a three-way diff if I use my test repo and make sure that the
url I diff with has one (or more) revs added than the file in my working
copy (and the local file has modifications).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2396547
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-18 19:11:56 CEST

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