monotone - Bugs: bug #20309, When the left and right...
You are not allowed to post comments on this tracker with your current authentication level.
bug #20309: When the left and right descendants contain the same change, merge into ancestor
Submitter: | nix_nix | ||
Submitted: | Sun 01 Jul 2007 08:24:02 AM UTC | ||
Category: | merge algorithm | Severity: | 3 - Normal |
Item Group: | feature request | Status: | None |
Privacy: | Public | Assigned to: | None |
Open/Closed: | Open | ||
mtn version --full: | monotone 0.35 (base revision: f92dd754bf5c1e6eddc9c462b8d68691cfeb7f8b)
|
Spam posted by anonymous | |
Sun 01 Jul 2007 11:19:50 AM UTC, comment #2: |
nix_nix |
Sun 01 Jul 2007 09:12:44 AM UTC, comment #1: Not sure how we would fix this.
|
Nathaniel Smith <njs> |
Sun 01 Jul 2007 08:24:02 AM UTC, original submission:
Perhaps this is an artifact of my using meld for all my manual merging, however:
|
nix_nix |
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-07-01 | nix_nix | Attached File | - | Added meld-screenshot.png, #13211 |
Powered by Savane 3.13-cf05.
Corresponding source code
OK. Bottom line: Fix meld. Understood. I wasn't sure whose scope this change was in. Thanks for making it clear.