Bazaar Mercurial Plugin to access BitBucket

Stephen J. Turnbull turnbull at sk.tsukuba.ac.jp
Fri Oct 21 07:26:14 UTC 2011


David Muir writes:

 > That's why I brought it up. I consider it one of Mercurial's weak
 > points. Bazaar IMO has the advantage here as the default is to merge
 > without fast-forward,

*blink*

You mean you want

0 --- 1              ? = default
       \            /
        `- A --- B-'   = feature

to merge to

0 --- 1 ------------ 2 = default
       \            /
        `- A --- B-'   = feature

instead of

0 --- 1 --- A --- B   = feature, default

??  OK, now that you mention it, I can see how that might be useful.

git-merge has a --no-ff (no fast-forward) option, so you're not the
only one who wants this.

 > but still has the option of doing `bzr merge --pull` if you want
 > that behaviour. With Mercurial there is no option to merge instead
 > of fast-forward, unless you're using named branches,

Ah, so (at the implementation level, i.e., a node can't be on two
branches at the same time) you like named branches for precisely the
reason I hate them!<wink>




More information about the bazaar mailing list