To make an embarrassing story short:
- The merge scenario from the previous post doesn't work the way I said it works in any DVCS it was tried on. I talked about the case of "merging merges" – when two people resolve the same conflict independently in different clones, and then someone pulls from both clones. More specifically, I mentioned the case where the conflict was between two similar patches, and each of the two people took a different patch when resolving the conflict. I claimed BitKeeper would then remove both patches in the final merge. Well, I'm still sure it did work that way for me once (an older version of bk?.. some specifics I didn't notice?..) But bk 4 works differently; it seems to take the later conflict resolution (throwing away one of the patches in my scenario, but not both). Mercurial reportedly takes the earlier resolution, throwing away the other patch. Git and Bazaar reportedly require user intervention, possibly preventing damage by automerges at the cost of, well, requiring user intervention. bk and hg do manage to create a working version in my specific scenario, but of course throwing away one of the conflict resolutions isn't always safe that way, it's only safe in my scenario where both resolutions are basically equivalent. Anyway, while "merging merges" is specific to DVCS, no contemporary one seems to screw you nearly as badly as I described; "most vexing merge", oh, c'mon. Also, it would be easy to guess that they all deal with this scenario differently, because this whole business of merging is heuristical, what are the chances for different heuristics to do the same thing? And in general it's awfully lame to publish stuff first and check it later. I suck.
- And the overall excited mood of that article sucked, too, 'cause, like, c'mon, everybody knows that automerges can cut your fingers off, big deal, calm down. I mean, the worst merge-related bugs I dealt with came from automerges that any kind of version control system would allow. Two changes done in different files, that kind of thing. Coding in a "merge-friendly" way is something few people do, and it isn't that easy. For example, you basically must never change semantics of definitions. If your function didn't lock that semaphore, and now it does, then a call added in another branch, which was completely safe, can now cause a deadlock. So what are you going to do, modify the function name each time you change its "observable semantics"? Is everybody really that anal-retentive about it? I doubt that. But we all live with automerges because it's cheaper to deal with their occasional damage than with the constant damage of manual merges, which take lots of time and are intolerably boring, thus very error prone. Which is why I prefer distributed systems and their better ability to merge long-living branches due to detailed recording of change history, even though long-living branches are extremely harmful. Harmful as they are, they will occasionally flourish, and then you need strong automerge, not manual merge, to end their evil lives. But anyway, who cares about the preferences of a person who doesn't even bother to check his own trivially testable claims?
Blech.
109 comments ↓
Don't mind me if i blow my foot off here, and start a hord of angry programmers on my ass.
I just see programmers for some reason or another just love this stuff, the debate about auto merging or manual merging. The more so the former group about auto merging different branch versions. Where if you ask any average user they don't really care about auto merging, its always assumed to them that if you have two out of date files you have to manual merge the two.
I'm of the former group, I see unless your concurrently working on the same document in real time your going to have manual merge the different branches. Now the next problem is that most programmer don't like have to be modifying the source code real time with another human being because of the obvious you have no idea what state the code is in when you hit compile. So were back at square one, and everyone wants their own snap-shot of the code to work with.
BTW current versions of BitKeeper detect this situation properly and highlight to the user the conflicting merge resolutions.
[...] an evil of distributed revision control systems (and a retraction, but still worth a [...]
Just for the record: The ability to perform merges-of-merges isn't a specific property of DVCSes. The exact same scenario can be tested in centralized VCS (provided they have working merge tracking). It's just that a) the independent merges are far less likely in central VCS because everyone sees the other merge, and b) DVCS have better merge tracking and heuristics, quite apart but not coincidential from being D.
I love reading through and I believe this website got some genuinely utilitarian stuff on it! .
Great article to check out, glad that Yahoo brought me here, Keep Up good Work
Intresting, will come back here once in a while.
google took me here. Thanks!
I conceive you have mentioned some very interesting details , appreciate it for the post.
Respect to website author , some wonderful entropy.
Some truly great stuff on this web site , appreciate it for contribution.
Enjoyed reading through this, very good stuff, thankyou .
I’m impressed, I have to admit. Genuinely rarely should i encounter a weblog that’s both educative and entertaining, and let me tell you, you may have hit the nail about the head. Your idea is outstanding; the problem is an element that insufficient persons are speaking intelligently about. I am delighted we came across this during my look for something with this.
very nice post, i actually love this web site, carry on it
Awesome, this is what I was looking for in bing
Ha, here from google, this is what i was searching for.
Some truly interesting posts on this web site , appreciate it for contribution.
Cheers, great stuff, I like.
Cheers, great stuff, I enjoying.
Intresting, will come back here later too.
This i like. Cheers!
Hi, i really think i will be back to your website
I conceive you have mentioned some very interesting details , appreciate it for the post.
I’m impressed, I have to admit. Genuinely rarely should i encounter a weblog that’s both educative and entertaining, and let me tell you, you may have hit the nail about the head. Your idea is outstanding; the problem is an element that insufficient persons are speaking intelligently about. I am delighted we came across this during my look for something with this.
I’m impressed, I have to admit. Genuinely rarely should i encounter a weblog that’s both educative and entertaining, and let me tell you, you may have hit the nail about the head. Your idea is outstanding; the problem is an element that insufficient persons are speaking intelligently about. I am delighted we came across this during my look for something with this.
This is cool!
I dugg some of you post as I thought they were very beneficial invaluable
Respect to website author , some wonderful entropy.
Intresting, will come back here more often.
Great, google took me stright here. thanks btw for info. Cheers!
Hello, i think that i saw you visited my site thus i came to “return the favor”.I am attempting to find things to improve my web site!I suppose its ok to use some of your ideas!!
Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.
Great blog! Is your theme custom made or did you download
it from somewhere? A theme like yours with a few simple tweeks would
really make my blog shine. Please let me know where you got your theme.
Bless you
I kinda got into this post. I found it to be interesting and loaded with unique points of interest.
Ha, here from yahoo, this is what i was looking for.
Yeah bookmaking this wasn’t a risky decision outstanding post! .
Hi there, I log on to your new stuff like every week.
Your humoristic style is awesome, keep it up!
Respect to website author , some wonderful entropy.
Thanks for finally writing about > Ahem < Loved it!
I was recommended this blog by my cousin. I'm not sure whether this post is written by him as nobody
else know such detailed about my problem.
You are incredible! Thanks!
very nice post, i actually like this web site, carry on it
I must say, as a lot as I enjoyed reading what you had to say, I couldnt help but lose interest after a while.
What's up, just wanted to say, I loved this blog post.
It was helpful. Keep on posting!
Pretty nice post. I just stumbled upon your blog and wanted to say
that I've really enjoyed surfing around your blog posts.
In any case I'll be subscribing to your feed and I hope you write
again very soon!
Great, yahoo took me stright here. thanks btw for info. Cheers!
I have interest in this, danke.
yahoo took me here. Cheers!
If you desire to grow your knowledge simply keep visiting this site and be
updated with the hottest information posted here.
This web site truly has all the info I wanted concerning this
subject and didn't know who to ask.
I know this site gives quality depending articles or reviews and
additional information, is there any other website which provides such
information in quality?
Hi, after reading this remarkable post i am too cheerful to share
my know-how here with mates.
What's up to every , since I am in fact keen of reading this blog's post to be updated on a regular basis.
It contains pleasant data.
Thanks for finally writing about > Ahem < Liked it!
Greetings! I know this is kinda off topic but I was wondering
if you knew where I could get a captcha plugin for my comment form?
I'm using the same blog platform as yours and I'm
having problems finding one? Thanks a lot!
Pretty section of content. I just stumbled upon your site and in accession capital to assert that I acquire
in fact enjoyed account your blog posts. Any way I will be
subscribing to your augment and even I achievement you
access consistently rapidly.
Spot on with this write-up, I actually believe that
this amazing site needs far more attention. I'll probably be returning to read through more, thanks for the advice!
Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.
Thank You for this.
Some truly fine content on this web site , appreciate it for contribution.
Found this on yahoo and I’m happy I did. Well written post.
I wanted to thank you for this good read!! I definitely loved every little
bit of it. I've got you bookmarked to look at
new things you post…
Hello everyone, it's my first pay a quick visit at this website, and article is in fact fruitful for me, keep
up posting these articles.
I simply must tell you that you have an excellent and unique website that I kinda enjoyed reading.
Awesome, this is what I was searching for in google
I conceive you have mentioned some very interesting details , appreciate it for the post.
Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.
Respect to website author , some wonderful entropy.
I really enjoy examining on this page , it has got good content .
I conceive you have mentioned some very interesting details , appreciate it for the post.
This is good. Cheers!
Ni hao, i really think i will be back to your site
Hi, happy that i found on this in bing. Thanks!
I am glad to be one of the visitors on this great website (:, appreciate it for posting .
Enjoyed reading through this, very good stuff, thankyou .
It's an awesome piece of writing in favor of all the web users; they will obtain advantage
from it I am sure.
I love reading through and I believe this website got some genuinely utilitarian stuff on it! .
Great, this is what I was looking for in bing
Great article to see, glad that google led me here, Keep Up cool job
Ni hao, i really think i will be back to your website
Morning, i really think i will be back to your website
This does interest me
Parasite backlink SEO works well :)
Enjoyed reading through this, very good stuff, thankyou .
Cheers, i really think i will be back to your website
yahoo brought me here. Cheers!
I am not rattling great with English but I get hold this really easygoing to read .
The next step of the enigma is to decode the order of the pyramid. This is your third confidential tip. 517232125
I love reading through and I believe this website got some genuinely utilitarian stuff on it! .
very cool post, i actually enjoyed this web site, carry on it
Yeah bookmaking this wasn’t a risky decision outstanding post! .
Found this on bing and I’m happy I did. Well written post.
Hi, yahoo lead me here, keep up good work.
With havin so much content do you ever run into any issues of plagorism or copyright infringement?
My website has a lot of unique content I've either written myself or outsourced but it seems a lot of it is popping it up all over the web without my agreement.
Do you know any methods to help protect against content from being stolen? I'd
certainly appreciate it.
Hi there! This post could not be written any better!
Reading through this post reminds me of my previous room mate!
He always kept chatting about this. I will forward this article to him.
Pretty sure he will have a good read. Many thanks
for sharing!
I am now not certain where you are getting your info, but great topic.
I needs to spend a while learning more or figuring out more.
Thanks for great info I used to be looking for this info for
my mission.
Hi colleagues, how is all, and what you would like to say regarding this piece of writing, in my view its truly awesome for
me.
Hello just wanted to give you a quick heads up and let you
know a few of the pictures aren't loading correctly.
I'm not sure why but I think its a linking issue.
I've tried it in two different web browsers and both show the same
results.
Alex9, this clue is your next piece of info. Feel free to message the agency at your convenience. No further information until next transmission. This is broadcast #8867. Do not delete.
Hello I am so happy I found your site, I really found you
by accident, while I was researching on Aol for something else,
Anyways I am here now and would just like to say cheers for a tremendous post and a all round enjoyable blog (I also love the
theme/design), I don’t have time to read it all at the
moment but I have book-marked it and also included your RSS feeds, so when I have time I will be back to read a
great deal more, Please do keep up the great work.
This does interest me
When I initially left a comment I appear to have clicked the -Notify me when new comments are added- checkbox and now
every time a comment is added I recieve 4 emails
with the exact same comment. Is there an easy method you can remove me from that service?
Cheers!
It's awesome to pay a quick visit this web page and reading the views
of all colleagues concerning this paragraph,
while I am also eager of getting knowledge. plenty
of fish natalielise
I must say, as a lot as I enjoyed reading what you had to say, I couldnt help but lose interest after a while.
What's up to every single one, it's truly a nice for me to pay a visit this site, it includes valuable Information.
Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.
Your style is very unique compared to other folks I have read stuff from.
I appreciate you for posting when you have the opportunity,
Guess I will just book mark this web site.
Appreciate it for this howling post, I am glad I observed this internet site on yahoo.
Howdy! This is my first visit to your blog! We are a group of volunteers and starting a new project in a community in the same niche.
Your blog provided us valuable information to work on. You have done a marvellous job!
natalielise plenty of fish
very Great post, i actually enjoyed this web site, carry on it