tag:blogger.com,1999:blog-27232680.post2217381601662637388..comments2024-03-20T06:54:32.435+01:00Comments on Plastic SCM blog: Merge recursive strategyF3RD3Fhttp://www.blogger.com/profile/11524626976811746062noreply@blogger.comBlogger10125tag:blogger.com,1999:blog-27232680.post-34974763734634142392012-01-25T15:18:31.295+01:002012-01-25T15:18:31.295+01:00I also find the arrows that go back and create cyc...I also find the arrows that go back and create cycles in your DAG to be confusing. Could you consider editing the figure that shows perhaps dotted lines without directional arrowheads going back to their parents, so that we can see merge parents without thinking that we have endless cycles in what was supposed to be a directed acyclic graph?<br /><br />WarrenWarrenhttps://www.blogger.com/profile/04053407632823479165noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-52621307971028652292012-01-17T19:09:10.984+01:002012-01-17T19:09:10.984+01:00I'll be replying to the mercurial thread short...I'll be replying to the mercurial thread shortly.<br /><br />The assumptions are not mistaken: they're considering "distance" differently, but the result is the same: Hg merge fails.<br /><br />But, I'll be replying as soon as I get access to the mercurial list and a good way to answer! :PPablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-84089089859022197522012-01-17T16:33:59.157+01:002012-01-17T16:33:59.157+01:00It looks like some of your assumptions about Mercu...It looks like some of your assumptions about Mercurial are mistaken. There was a discussion exactly about your post that explains better the Mercurial's behavior in this topic. Here is the link: http://selenic.com/pipermail/mercurial/2012-January/041456.htmlPatchworkhttps://www.blogger.com/profile/05358665841615288641noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-24644793822886320332012-01-17T11:25:38.573+01:002012-01-17T11:25:38.573+01:00See this post by Matt Mackall for some critique:
...See this post by Matt Mackall for some critique:<br /><br />http://article.gmane.org/gmane.comp.version-control.mercurial.general/29523Martin Geislerhttp://geisler.net/noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-5119194735985962192011-12-08T16:07:12.190+01:002011-12-08T16:07:12.190+01:00Ok, if there's a conflict on the intermediate ...Ok, if there's a conflict on the intermediate merge:<br /><br />1- If the conflict is a directory -> the solution is to get the status it has on the base (I mean, a directory conflict: moves, renames, deletes, whatever). It means no intermediate resolution will happen.<br /><br />2- If the conflict is a file -> all the intermediate conflicts will be prompted to the user. Git tries to do the same, but Plastic does it correctly :PPablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-44601471038771902332011-12-08T15:07:16.811+01:002011-12-08T15:07:16.811+01:00@Sheldon. I was about to ask the exact same questi...@Sheldon. I was about to ask the exact same question.<br /><br />How does this algorithm account for conflicts when creating this virtual ancestor?Albertohttps://www.blogger.com/profile/17418454965344755565noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-43164927163992947362011-10-31T23:00:37.432+01:002011-10-31T23:00:37.432+01:00Hi, Pablo!
I’m the web editor at iMasters, one of...Hi, Pablo!<br /><br />I’m the web editor at iMasters, one of the largest developer communities in Brazil. I´d like to talk to you about republishing your article at our site. <br /><br />Can you contact me at rina.noronha@imasters.com.br?Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-27232680.post-89672563762003395562011-10-14T16:05:18.626+02:002011-10-14T16:05:18.626+02:00Hi, Pablo!
I’m the web editor at iMasters, one of...Hi, Pablo!<br /><br />I’m the web editor at iMasters, one of the largest developer communities in Brazil. <br /><br />I´d like to talk to you about republishing your article at our site. <br /><br />Can you contact me at rina.noronha@imasters.com.br?<br /><br />Bests,<br />Rina Noronha<br />Journalist – web editor<br />www.imasters.com.br<br />redacao@imasters.com.br<br />rina.noronha@imasters.com.br<br />+55 27 3327-0320 / +55 27 9973-0700Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-27232680.post-41001399679758798152011-10-11T15:57:29.881+02:002011-10-11T15:57:29.881+02:00@Sheldon: Git uses the conflicted merge result as ...@Sheldon: Git uses the conflicted merge result as a merge base, including conflict markers. For example, if we have bXd in one common ancestor and bYd in the other, the conflicted merge result would be bd, where each character represents a line in a line-by-line merge, and <|> represent conflict markers. This merge base will force a conflict in the final merge as well. And in case of a conflict, it does not really matter what the merge base is. The result only depends on the tips of the branches. For example, if one tip contains bxd and the other byd, the result is bd.<br /><br />Note that either branch had to resolve the same conflict before, since they merged the common ancestors at some point. If they happen to resolve it in the same way, the tips are the same and there is no conflict.Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-27232680.post-4201203249213137472011-09-28T18:19:41.348+02:002011-09-28T18:19:41.348+02:00what happens if the merge of the 2 common ancestor...what happens if the merge of the 2 common ancestors results in a conflict?Sheldonhttps://www.blogger.com/profile/10647095907182055320noreply@blogger.com