monotone - Bugs: bug #18214, Clobber merge
You are not allowed to post comments on this tracker with your current authentication level.
bug #18214: Clobber merge
Submitter: | Thomas Keller <tommyd> | ||
Submitted: | Mon 06 Nov 2006 11:21:15 AM UTC | ||
Category: | merge algorithm | Severity: | 1 - Wish |
Item Group: | feature request | Status: | None |
Privacy: | Public | Assigned to: | None |
Open/Closed: | Open | ||
mtn version --full: | mtn-0.30 |
Spam posted by anonymous | |
Mon 06 Nov 2006 09:05:29 PM UTC, comment #1: |
Nathaniel Smith <njs> |
Mon 06 Nov 2006 11:21:15 AM UTC, original submission:
Hi!
|
Thomas Keller <tommyd> |
No files currently attached
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.
Powered by Savane 3.13-4b48.
Corresponding source code
It was never actually released -- I just hacked it up on a side-branch in an attempt to solve some particular horrible problem they had. None of that code is relevant now, though, because rosters work totally differently. On the other hand, rosters also make writing such a thing totally trivial.
This becomes somewhat irrelevant if other things are written (workspace merge, arbitrary revert), which is discussed a bit here:
http://groups.google.com/group/comp.lang.ada/tree/browse_frm/thread/a326ac15995ef20e/82158702a90fb9dd?rnum=21&q=comp.lang.ada+monotone&_done=%2Fgroup%2Fcomp.lang.ada%2Fbrowse_frm%2Fthread%2Fa326ac15995ef20e%2Fbf2f9970828367bd%3Ftvc%3D1%26q%3Dcomp.lang.ada+monotone%26#doc_5130fabe77c45f22
Question is just if someone wants to bother putting in the work on a special clobber merger instead of those more general (but harder) problems.