bugmonotone - 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: 


  Spam posted by anonymous
Mon 06 Nov 2006 09:05:29 PM UTC, comment #1: 

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:


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.

Nathaniel Smith <njs>
Group Member
Mon 06 Nov 2006 11:21:15 AM UTC, original submission:  


I've heard from Koen that mtn had once a clobber merger back in 0.25 (basically a merge which lets one chosen side win completly). I miss such a functionality pretty much in current versions of monotone, since there's no workspace merge yet and if I find a merge to be very complex and don't care about the other side, I'd like to be able to clobber merge it.


Thomas Keller <tommyd>
Group administrator


(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

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

Back to the top

Powered by Savane 3.13-4b48.
Corresponding source code