On 30.07.2014 21:33, Ben Fritz wrote:
> On Wed, Jul 30, 2014 at 1:16 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> On 30.07.2014 19:05, Ben Fritz wrote:
>>> I want to use Beyond Compare or KDiff3 for a directory comparison,
>>> when I use TortoiseSVN →Diff with URL. This would be much more usable
>>> to me than the patch viewer, which also sometimes just errors out.
>>>
>>> I looked in the TortoiseSVN settings for Diff Viewer but didn't see
>>> any relevant options, and a web search just turned up advice about
>>> exporting the two URLs and diffing on the file system. Is there a
>>> configuration option I'm missing? If not could this be added?
>>
>> You can not do directory diffs in TSVN, no matter what diff tool you're
>> using. A diff of a directory always returns the diff of its properties,
>> but never of its contents.
>>
>
> Actually that's not quite true.
>
> http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-diff.html
> says under the heading "Difference between WC file/folder and a URL"
> (and I've done this a couple times) that "Diff with URL" on a
> working-copy folder will use TortoiseMerge to dispaly the difference
> as if it were applying a patch. This isn't incredibly useful but
> better than nothing.
That feature requires a diff tool that can apply patches. AFAIK TMerge
is the only UI diff tool that can do that properly.
That's why this isn't configurable.
> More useful, for comparing 2 branches, is
> http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-diff.html#tsvn-dug-compare-revs
> which I just stumbled on while looking for that reference. I can
> select two sibling directories in the repository browser easily and
> compare them, showing a list of files that differ, and I can
> double-click on each file to see the differences. This is the sort of
> view I'm looking for.
But this requires an svn client to fetch the files first, and then pass
those to a diff tool.
It's not possible to pass the two urls to the diff tool, so the
'directory diff' isn't done by the diff tool.
> But my use case is actually comparing a branch to the trunk. I cannot
> figure out a way to select both the trunk directory and one of the
> branches to use the "Compare URLs" feature of repository browser. Only
> one item at a time can be selected in the left pane.
right-click on folder, select "mark for comparison". The folder is then
shown in bold in the tree view on the left.
right-click on the second folder, select "Compare URLs".
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=3086014
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-30 22:22:48 CEST