monotone - Bugs: bug #15985, make merge tool selection saner
You are not allowed to post comments on this tracker with your current authentication level.
bug #15985: make merge tool selection saner
Submitter: | Nathaniel Smith <njs> | ||
Submitted: | Sat 04 Mar 2006 09:59:30 AM UTC | ||
Category: | merge algorithm | Severity: | 1 - Wish |
Item Group: | None | Status: | None |
Privacy: | Public | Assigned to: | None |
Open/Closed: | Open | ||
mtn version --full: |
|
No files currently attached
Depends on the following items: None found
Items that depend on this one: None found
CC list is empty
There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.
No changes have been made to this item
Powered by Savane 3.13-4b48.
Corresponding source code
Some issues now:
-- we don't check for failures in the merge command we call
(this used to be because xxdiff gave weird error codes, but
that has been fixed in mainline by passing xxdiff the
"give sane error codes" switch).
-- we should not attempt graphical mergers when there is no
GUI running; I think "gui running" is best defined as
"on win32, or os x, or DISPLAY is set"
-- users should be able to choose which merger to use more
sanely.