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

Submitted by:  Thomas Keller <tommyd>
Submitted on:  Mon 06 Nov 2006 11:21:15 AM UTC  
Category: merge algorithmSeverity: 1 - Wish
Item Group: feature requestStatus: None
Privacy: PublicAssigned to: None
Open/Closed: Open
mtn version --full: 


(Why is this post is considered to be spam? Users may have reported it to be spam or, if it has been recently posted, it may just be waiting for spamchecks to be run.)
Spam content:

[http://giftbasketsblog.net/ Gift Baskets]
[http://flowersdictionary.net/ Flowers]
[http://springflowerslist.net/ Spring Flowers]
[http://kidssofttoys.net/ Soft Toys]
[http://onmytod.net/ Acne Treatment]
[http://placeronline.net/ Alternative Medicine]
[http://tushyclean.net/ Anti Aging]
[http://waveport.net/ Health and Beauty]
[http://bridgmanfootball.com/ Cancer symptoms and risks]
[http://mangroveadv.com/ Great Fishing]
[http://dreamdogmedia.com/ Muscle building]
[http://wench-wear.com/ Fashion world]
[http://baninter.com/ Diseases and Conditions]
[http://netmatecentral.com/ Exercise and Meditations]

[http://blooddrugtest.net/ blood drug test]
[http://employmentdrugtesting.net/ employment drug testing]
[http://hair-drug-test.com/ hair drug test]
[http://passing-a-drug-test.com/ pass a drug test]
[http://random-drug-testing.net/ random drug testing]
[http://saliva-drug-test.org/ saliva drug test]
[http://urine-drug-test.net/ urine drug test]
[http://workplacedrugtesting.net/ workplace drug testing]
[http://employee-drug-testing.net/ employee drug testing]
[http://marijuana-drug-test.org/ marijuana drug test]
[http://homedrugtestkits.org/ home drug test kits]
[http://drugtestingkits.org/ drug testing kits]

[http://mp3audioz.com mp3 downloads]
[http://mp3worldz.com download mp3]
[http://mp3front.com buy mp3 music]
[http://mp3location.com mp3 music downloads]
[http://wintermp3.com music mp3 download]
[http://mp3loud.com mp3 audio download]
[http://movieworldz.com movies dvd dowload]
[http://boxdetox.com pass a drug test]
[http://abcbasket.com gift baskets]

[http://kzwebst.net/ kazakh xml manual]
[http://xmldoc.org/ xml manual]
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>
Project 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>
Project Administrator


No files currently attached


Depends on the following items: None found

Items that depend on this one: None found


CC list is empty


Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.


Please enter the title of George Orwell's famous dystopian book (it's a date):



No Changes Have Been Made to This Item

Back to the top

Powered by Savane 3.1-cleanup1