Using merge --pull

Eli Zaretskii eliz at gnu.org
Sat Jan 16 11:20:20 GMT 2010


> From: Juanma Barranquero <lekktu at gmail.com>
> Date: Sat, 16 Jan 2010 11:36:48 +0100
> Cc: bazaar at lists.canonical.com
> 
> On Sat, Jan 16, 2010 at 11:03, Eli Zaretskii <eliz at gnu.org> wrote:
> 
> > Is there a downside to using "bzr merge --pull" even if the branch is
> > _known_ to diverge from the source?  From the docs, I understand that
> > if the `pull' attempt succeeds, I don't need to commit after the
> > merge.  This could be a win, because I need not remember to commit
> > afterwards.  So this is a potential advantage; are there any
> > disadvantages?
> 
> If you accidentally use "merge --pull" in the trunk, for example

I meant merging in a branch, while the source is the trunk or a parent
branch.

>   cd trunk
>   bzr merge --pull ../my-development-branch
> 
> you will commit into trunk all changes in my-development-branch, as
> separate commits (not as a single merge commit).

How do separate commits enter this picture?




More information about the bazaar mailing list