[08:00] hi, I'm learning how bzr merges branches now. I undestand bzr uses the algorithm called LCA Merge today. [08:00] but what does it differ from Recursive Three-way Merge? It seems very similar to me. [08:00] I mean the recursive three-way merge of Git. [08:07] Actually, I think the default is still plain 3-way merge, with LCA and weave as alternate options. [08:09] Vague memory says that the 'lca' variant uses per-file LCA's rather than full-tree? But I wouldn't put much stock in my memory. [08:10] I don't think bzr does git-ish recursive-3-way. At least not without a plugin I've never heard of. [08:23] Oh I just read literally bzr wiki says that it *could* be the default... [08:23] Am I right to think bzr uses plain 3-way merge by default, and with options it can merge by 'lca' which is more accurate than 'recursive' strategy of git. [08:24] "more accurate" is a bottomless pit of discussion ;p [08:27] indeed :p okay, I'll keep on learning. thank you. [08:41] Once upon a time, there were decent descriptions/discussions/etc on the revctrl wiki. [08:41] It was drowned in spam and them tossed away some years back, but there might be an archive somewhere. === fullermd_ is now known as fullermd === jacekn_ is now known as jacekn [11:51] I think bzr missing displays the wrong message. [11:51] bzr missing --theirs-only -r1234 bzr+ssh:/path/to/remove [11:51] displays [11:51] Other branch is up to date. [11:52] actually surely it means *this* branch is up to date. "My branch" as the command line options call it. [11:53] oh there we go [11:53] https://bugs.launchpad.net/bzr/+bug/250296 [11:53] Ubuntu bug 250296 in Bazaar "bzr missing gives confusing 'up to date' message" [Low,Confirmed] [11:53] reported 2008 :( [13:23] @fullermd: I've never heard about revctl wiki but it looks very valuable in the internet archive [13:24] @fullermd: I wish I was then interested in this topic... === abentley__ is now known as abentley === thumper is now known as thumper-gym