noob - understanding branches diverged

[Mike Mattie]

On Wed, Apr 15, 2009 at 01:08:02PM +0900, Stephen J. Turnbull wrote:
> 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.
> 

Hmmmm

After much experimentation with my workflow I decided to use unbound
branches. I assumed that for unbound branches that the push/pull
commands were the appropriate way to send/receive changes between
unbound branches. That assumption came from git.

So what your are saying is that I should use merge instead ?

From my limited experience with GIT I think I do want a fast-forward
merge, but you think otherwise ?

-- 
GnuPG Key: B9012279 is available from HKP server pgp.mit.edu
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090416/5131188b/attachment-0001.pgp