Well, it's difficult to compare to folders if you can't see them as folders.
The whole point of branching is that you don't have to copy the entire
repository to work on a piece of the tree. So you have, say, the entire
development tree pointing to the trunk, and a subtree within pointing to a
branch. Hence, I don't have the ability to diff through the explorer.
As long as the diff tool can't deal with directories, we'll have to settle
for the unified diff, but we need to be able to parse that file and display
the results in a meaningful way.
Amir Kolsky
XP& Software
>-----Original Message-----
>From: Peter Mounce [mailto:petermounce@iml.co.uk]
>Sent: Friday, February 25, 2005 1:23 PM
>To: dev@tortoisesvn.tigris.org
>Subject: RE: [TSVN] Unified Diff viewer
>
>> -----Original Message-----
>> From: Simon Large [mailto:slarge@slarge.plus.com]
>
>> I presume this is the Perforce tool. We already have the WinMerge
>> params in the docs (under TSVN settings) when it is used as a merge
>> tool, but not when used as a diff tool. What params do you use for
>> that?
>
>WinMerge is AFAIK opensource. I use
>
>C:\Program Files\WinMerge\WinMergeU.exe %base %mine
>
>for diff tool and merge tool in Diff/Merge tab, and
>
>C:\Program Files\WinMerge\WinMergeU.exe for the .patch file viewer one.
>
>I don't know whether the last one works; I've never had to
>view/edit a GNU .patch file (or any other sort).
>
>I don't know how to tell TSVN to compare two different
>directories, though; if I need to do that, I load WinMerge
>directly and pick which two directories to start at. This
>gives me a comparison; double-clicking on items will compare
>the item with its "partner" in the other side of the window -
>either file view or directory view, depending what was double-clicked.
>
>
>Peter Mounce
>IML Ltd
>
>e: mailto:petermounce_at_iml.co.uk w: http://www.iml.co.uk
>t: (01428) 727476 f: (01428) 727011
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Feb 25 13:30:58 2005