Ahem

To make an embarrassing story short:

  1. 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.
  2. 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.

67 comments ↓

#1 Entity on 07.16.08 at 4:13 pm

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.

#2 Wayne on 03.31.09 at 4:26 am

BTW current versions of BitKeeper detect this situation properly and highlight to the user the conflicting merge resolutions.

#3 bfish.xaedalus.net » A tech blog recommendation on 04.28.10 at 5:47 pm

[...] an evil of distributed revision control systems (and a retraction, but still worth a [...]

#4 Andreas Krey on 07.10.10 at 11:59 am

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.

#5 paladins aimbot on 05.15.19 at 4:05 pm

I love reading through and I believe this website got some genuinely utilitarian stuff on it! .

#6 krunker hacks on 05.16.19 at 12:40 pm

Great article to check out, glad that Yahoo brought me here, Keep Up good Work

#7 fortnite aimbot download on 05.16.19 at 4:34 pm

Intresting, will come back here once in a while.

#8 nonsense diamond download on 05.17.19 at 6:47 am

google took me here. Thanks!

#9 fallout 76 hacks on 05.17.19 at 10:14 am

I conceive you have mentioned some very interesting details , appreciate it for the post.

#10 red dead redemption 2 digital key resale on 05.17.19 at 3:25 pm

Respect to website author , some wonderful entropy.

#11 redline v3.0 on 05.17.19 at 6:28 pm

Some truly great stuff on this web site , appreciate it for contribution.

#12 chaturbate hack cheat engine 2018 on 05.18.19 at 7:54 am

Enjoyed reading through this, very good stuff, thankyou .

#13 led ryggsäck on 05.18.19 at 2:46 pm

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.

#14 mining simulator codes 2019 on 05.19.19 at 6:46 am

very nice post, i actually love this web site, carry on it

#15 smutstone on 05.20.19 at 11:25 am

Awesome, this is what I was looking for in bing

#16 redline v3.0 on 05.21.19 at 6:54 am

Ha, here from google, this is what i was searching for.

#17 free fire hack version unlimited diamond on 05.21.19 at 4:09 pm

Some truly interesting posts on this web site , appreciate it for contribution.

#18 nonsense diamond on 05.22.19 at 5:59 pm

Cheers, great stuff, I like.

#19 krunker aimbot on 05.23.19 at 6:18 am

Cheers, great stuff, I enjoying.

#20 bitcoin adder v.1.3.00 free download on 05.23.19 at 9:56 am

Intresting, will come back here later too.

#21 vn hax on 05.23.19 at 6:40 pm

This i like. Cheers!

#22 eternity.cc v9 on 05.24.19 at 7:28 am

Hi, i really think i will be back to your website

#23 ispoofer pogo activate seriale on 05.24.19 at 5:53 pm

I conceive you have mentioned some very interesting details , appreciate it for the post.

#24 cheats for hempire game on 05.26.19 at 6:19 am

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.

#25 iobit uninstaller 7.5 key on 05.26.19 at 9:05 am

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.

#26 smart defrag 6.2 serial key on 05.26.19 at 3:25 pm

This is cool!

#27 resetter epson l1110 on 05.26.19 at 6:02 pm

I dugg some of you post as I thought they were very beneficial invaluable

#28 sims 4 seasons free code on 05.27.19 at 7:19 am

Respect to website author , some wonderful entropy.

#29 rust hacks on 05.27.19 at 7:52 pm

Intresting, will come back here more often.

#30 strucid hacks on 05.28.19 at 10:10 am

Great, google took me stright here. thanks btw for info. Cheers!

#31 gamefly free trial on 05.28.19 at 6:36 pm

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!!

#32 expressvpn key on 05.28.19 at 7:14 pm

Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.

#33 how to get help in windows 10 on 05.29.19 at 12:06 am

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

#34 ispoofer license key on 05.29.19 at 8:27 am

I kinda got into this post. I found it to be interesting and loaded with unique points of interest.

#35 aimbot free download fortnite on 05.29.19 at 12:25 pm

Ha, here from yahoo, this is what i was looking for.

#36 redline v3.0 on 05.29.19 at 4:53 pm

Yeah bookmaking this wasn’t a risky decision outstanding post! .

#37 gamefly free trial on 05.30.19 at 5:25 am

Hi there, I log on to your new stuff like every week.

Your humoristic style is awesome, keep it up!

#38 vn hax on 05.30.19 at 6:05 am

Respect to website author , some wonderful entropy.

#39 gamefly free trial on 05.30.19 at 6:54 am

Thanks for finally writing about > Ahem < Loved it!

#40 how to get help in windows 10 on 05.31.19 at 1:30 am

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!

#41 xbox one mods free download on 05.31.19 at 12:39 pm

very nice post, i actually like this web site, carry on it

#42 fortnite aimbot download on 05.31.19 at 3:23 pm

I must say, as a lot as I enjoyed reading what you had to say, I couldnt help but lose interest after a while.

#43 gamefly free trial on 05.31.19 at 9:11 pm

What's up, just wanted to say, I loved this blog post.

It was helpful. Keep on posting!

#44 gamefly free trial on 06.01.19 at 4:12 pm

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!

#45 mpl pro on 06.01.19 at 6:21 pm

Great, yahoo took me stright here. thanks btw for info. Cheers!

#46 hacks counter blox script on 06.02.19 at 6:27 am

I have interest in this, danke.

#47 chaturbate tokens hack generator 2018 pc on 06.03.19 at 10:16 am

yahoo took me here. Cheers!

#48 gamefly free trial on 06.04.19 at 8:52 pm

If you desire to grow your knowledge simply keep visiting this site and be
updated with the hottest information posted here.

#49 gamefly free trial on 06.04.19 at 10:24 pm

This web site truly has all the info I wanted concerning this
subject and didn't know who to ask.

#50 gamefly free trial on 06.06.19 at 6:46 am

I know this site gives quality depending articles or reviews and
additional information, is there any other website which provides such
information in quality?

#51 gamefly free trial on 06.06.19 at 5:45 pm

Hi, after reading this remarkable post i am too cheerful to share
my know-how here with mates.

#52 gamefly free trial on 06.06.19 at 7:39 pm

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.

#53 gamefly free trial on 06.08.19 at 1:28 am

Thanks for finally writing about > Ahem < Liked it!

#54 ps4 best games ever made 2019 on 06.12.19 at 4:26 am

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!

#55 playstation 4 best games ever made 2019 on 06.12.19 at 5:01 am

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.

#56 quest bars on 06.16.19 at 3:58 pm

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!

#57 protosmasher cracked on 06.17.19 at 1:07 am

Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.

#58 proxo key on 06.19.19 at 10:01 am

Thank You for this.

#59 vn hax pubg on 06.20.19 at 6:51 pm

Some truly fine content on this web site , appreciate it for contribution.

#60 nonsense diamond key generator on 06.21.19 at 8:04 am

Found this on yahoo and I’m happy I did. Well written post.

#61 plenty of fish dating site on 06.21.19 at 11:49 pm

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…

#62 quest bars cheap on 06.23.19 at 2:31 pm

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.

#63 star valor cheats on 06.23.19 at 5:30 pm

I simply must tell you that you have an excellent and unique website that I kinda enjoyed reading.

#64 gmod hacks on 06.24.19 at 3:33 pm

Awesome, this is what I was searching for in google

#65 how do we KNOW on 06.25.19 at 5:25 am

I conceive you have mentioned some very interesting details , appreciate it for the post.

#66 fortnite mods on 06.25.19 at 8:14 pm

Just wanna input on few general things, The website layout is perfect, the articles is very superb : D.

#67 krunker aimbot on 06.26.19 at 6:53 am

Respect to website author , some wonderful entropy.

Leave a Comment