RFE 698119: Add feature for external diff to allow three-way diff (and others)

Hi,

I think this would be a nice feature for those who use a merge tool 
capable of three-way diffs. (You may have guessed, I do :-) ) I'd like 
to implement that as follows:

- Two new entries in the "Compare type" combo box: "Local copy against 
same revision and another revision", "Local copy against two other 
revisions"
- Appropriate modifications to ::CvsCmdDiff
- Appropriate modifications to ::LaunchDiff
- New preference together with "External diff" ("WinCvs" tab 
in "Preferences" dialog): "External diff command line" (string), 
default '%1 %2'. This would allow passing custom switches to the differ 
and specify whether the differ is capable of three-way diffs (is there 
a %3 in the command line?)
- Diff dialog: If no three-way differ is available, it would not allow 
selecting a compare type where three-way diff is needed. (An 
informative message box would appear when the user clicked OK.)

While I'm at it, it'd be easy to add other entries to above combo, like:

- "Current revision against head of current branch" (query-update with 
preview of modifications)
- "Local copy against same revision and head of current branch" (query-
update with preview of modifications and conflicts)
- "Local copy against head of current branch" (query-update with 
preview of conflicts)
- ...

One can specify that manually even now, but selecting an entry in the 
combo box is easier and faster.

(In fact, those new entries above and the preference enhancement would 
be the only improvements useful for two-way-only differs.)

What do you think? I'd love to get some opinions before I start.


Cheers,

Kirill

------------------------------------

RFE 698119: Add feature for external diff to allow three-way diff

I use a diff tool that allows for the comparison of three revisions of 
an archive. This is useful to resolve conflicts on a given archive. The 
current diff launch only allows the user to specify two revisions. It 
would be useful to have the external diff launched with three revisions 
of an archive.







 
Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/cvsgui-dev/

<*> To unsubscribe from this group, send an email to:
    [email protected]

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/