Remote Merge

[Matthieu Moy]

John A Meinel <john at arbash-meinel.com> writes:

> You probably need to do:
> bzr branch sftp://my@remote/branch local_branch
> cd local_branch
> <hack hack>
> bzr commit -m "Made some changes"
> bzr missing # See what is missing locally compared
> 	    # with the "parent"
>
> bzr merge
> bzr commit -m "[merge] up-to-date with build branch"
> bzr push

AIUI, bzr push as it is now in bzrtools will work only if the trees
haven't diverged. So, if someone else did a push between your pull and
your push, then push will fail.

-- 
Matthieu