monotone - Bugs: bug #21569, 3 way merge by kdiff3
You are not allowed to post comments on this tracker with your current authentication level.
bug #21569: 3 way merge by kdiff3
Submitter: | Gabor Opposits <ogabor> | ||
Submitted: | Tue 13 Nov 2007 12:53:25 PM UTC | ||
Category: | merge algorithm | Severity: | 3 - Normal |
Item Group: | incorrect behavior | Status: | None |
Privacy: | Public | Assigned to: | None |
Open/Closed: | Open | ||
mtn version --full: | monotone 0.30 (base revision: unknown)
|
Spam posted by anonymous | |
Wed 14 Nov 2007 10:44:49 AM UTC, comment #1: |
Thomas Moschny <moschny> |
Tue 13 Nov 2007 12:53:25 PM UTC, original submission:
opgabor@petrence:/c/temp/vpp$ mtn merge
|
Gabor Opposits <ogabor> |
Depends on the following items: None found
Items that depend on this one: None found
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.
Follows 1 latest change.
Date | Changed by | Updated Field | Previous Value | => | Replaced by |
---|---|---|---|---|---|
2007-11-13 | ogabor | Attached File | - | Added mtn.JPG, #14375 |
Powered by Savane 3.13-4b48.
Corresponding source code
The left pane ("A") contains the ancestor. My kdiff3 displays "(Base)" next to the filename for file "A" in order to remind me on that.
There's currently no indication to which revisions file versions "B" and "C" belong. We might want to improve that. However, it is not clear what the most important information to display would be: revision_id? date? author? , because the available space is limited.
If you want to see how kdiff3 is called, have a look at the mergers.kdiff3 function in std_hooks.lua. Using custom lua code in your monotonerc, you can override the standard behavior.