Login | Register
My pages Projects Community openCollabNet

Discussions > users > Diff with URL: tortoiseMerge

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

2020-03-13: This site is going to be decommissioned and shut down very soon. Please copy and archive any data you wish to keep ASAP

Back to topic list

Diff with URL: tortoiseMerge

Author "Christophe Royer" <chroyer at comcast dot net>
Full name "Christophe Royer" <chroyer at comcast dot net>
Date 2009-09-17 10:58:39 PDT
Message 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?


Thanks

Christophe
Attachments

« Previous message in topic | 1 of 8 | Next message in topic »

Messages

Show all messages in topic

Diff with URL: tortoiseMerge "Christophe Royer" <chroyer at comcast dot net> "Christophe Royer" <chroyer at comcast dot net> 2009-09-17 10:58:39 PDT
     Re: Diff with URL: tortoiseMerge jeanmarc Jean-Marc van Leerdam 2009-09-17 12:49:55 PDT
     Re: Diff with URL: tortoiseMerge "Christophe R" <christophe_r at comcast dot net> "Christophe R" <christophe_r at comcast dot net> 2009-09-18 06:55:31 PDT
     Re: Diff with URL: tortoiseMerge steveking Stefan Küng 2009-09-18 10:11:53 PDT
     Re: Diff with URL: tortoiseMerge "Christophe R" <christophe_r at comcast dot net> "Christophe R" <christophe_r at comcast dot net> 2009-09-30 08:34:33 PDT
         Re: Diff with URL: tortoiseMerge steveking Stefan Küng 2009-09-30 11:50:04 PDT
             RE: Re: Diff with URL: tortoiseMerge christophe_r Christophe R. 2009-10-06 10:01:38 PDT
                 RE: Re: Diff with URL: tortoiseMerge christophe_r Christophe R. 2009-10-28 12:11:01 PDT
Messages per page: