Re: [TSVN] No menu entry "Diff" for conflicted files

Hi,

>> Unfortunately there's no "Diff" entry in a conflicted files'
>> context menu.

> What do you define as BASE? Is it the version you made your original
> changes against

exactly. And a good point - that's not the version "Diff" would
diff against, right? AFAIK "Diff" would show the differences
between my file and the file last received from the repro.

Mmmh - thinking about that it might even make more sense to
diff against the last received copy.

> You can do this already, it's just not very obvious:
> Select MyFile.ext and MyFile.ext.merge-left.rxxx or
> MyFile.ext.merge-right.rxxx (depending on which one you consider is
> BASE). You now have 2 files selected, and SVN diff appears in the
> context menu.

My files are not called "left" or "right" but ".mine", ".r(n)" and
".r(n+1)". And I must confess that I always need quite a while to
be certain which is which...

Kind regards

Sven

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jun 25 02:29:36 2005