RE: Re: Diff with URL: tortoiseMerge

This is what I did to reproduce/isolate the scenario:
-create a new repo (with tsvn), with /trunk and /branches
-add and commit 2 files to the trunk
-branch the trunk to /branches/b1
-checkout b1 in wc-b1
-edit the 2 files (do not commit)
-shift-right click on wc-b1, choose diff with URL. Enter the URL of the trunk

tortoiseMerge shows up with a list of 2 files, both in red. Double clicking on any one of them set tortoiseMerge in 3 way pane mode.

After that, I committed one of the file only in the branch, then did diff with url again: this time, the commited file shows in black in the small file list displayed by tortoiseMerge, and double clicking on this file name shows tortoisemerge in 2 pane mode.

Christophe

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2404204

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-06 19:15:38 CEST