[Bug 3540] New: Allow to specify revisions in merge tool arguments

[bugzilla-daemon at bz.selenic.com]

http://bz.selenic.com/show_bug.cgi?id=3540

          Priority: normal
            Bug ID: 3540
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Allow to specify revisions in merge tool arguments
          Severity: feature
    Classification: Unclassified
                OS: All
          Reporter: vitalif at yourcmc.ru
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.2.2
         Component: Mercurial
           Product: Mercurial

Created attachment 1677
  --> http://bz.selenic.com/attachment.cgi?id=1677&action=edit
Patch for filemerge.py

Now Mercurial outputs default merge markers (local, base, other) when merging.
It would be convenient to see revision numbers there.
This can be solved by allowing to specify revisions in merge tool arguments,
for example $revbase and $revother, like:

[merge-tools]
filemerge.executable = /usr/bin/merge
filemerge.args = -L local -L "base (rev $revbase)" -L "other (rev $revother)"
-A $local $base $other

The patch to support it is very simple, it's in the attachment.

-- 
You are receiving this mail because:
You are on the CC list for the bug.