monotone

Issue 54: Clobber merge

Reported by Thomas Keller, Nov 6, 2006

(This entry was imported from the savannah tracker, original 
location: https://savannah.nongnu.org/bugs/index.php?18214)

Hi!

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.

monotone version:
-----------------
mtn-0.30

Comment 1 by Unknown User, Nov 6, 2006

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/a
326ac15995ef20e/82158702a90fb9dd?rnum=21&q=comp.lang.ada+monotone
&_done=%2Fgroup%2Fcomp.lang.ada%2Fbrowse_frm%2Fthread%2Fa326ac159
95ef20e%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.

Created: 9 years 9 months ago by Thomas Keller

Updated: 8 years 10 days ago

Status: New

Labels:
Type:Feature Request
Component:Merge Algorithm
Priority:Low

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status