noob - understanding branches diverged

Stephen J. Turnbull stephen at xemacs.org
Wed Apr 15 05:08:02 BST 2009


Mike Mattie writes:

 > 5. home box: pull - "branches have diverged"
 > 6. home box: merge .... works.

AFAICS "bzr pull" is almost never what you want.  It definitely has
very different semantics from all other VCSes that use that name for a
command.  Specifically, since bzr doesn't have colocated branches, all
branches other than the current one are "remote", and thus "bzr merge"
must "go get" the new revisions, then merge them into the current
branch.

Ie, "bzr merge" is analogous to "git pull" or "hg pull -u", not to the
corresponding "merge" commands.

"bzr pull" is closer to "cvs update" than anything else.  It is
looking for a fast-forward merge, and otherwise isn't very useful.




More information about the bazaar mailing list