Remote Merge

[Nathaniel McCallum]

On Thu, 2005-10-27 at 14:35 -0500, John A Meinel wrote:
> > So (?):
> >   bzr branch sftp://my@remote/branch local_branch
> >   cd local_branch
> >   <make changes to local branch>
> >   bzr merge sftp://my@remote/branch  # Merges remote and local into the local branch
> >   bzr push sftp://my@remote/branch   # "Commits" to the remote branch
> 
> One thing you should be aware of. Whenever you run branch, missing, or
> pull, if not already set, bzr will set the "parent" of the branch. This
> is a default location where the other commands will take effect. So you
> don't need to type it out every time. If you ever change what the
> "parent" or "upstream" branch is, then you would need
> 	bzr pull --remember sftp://my@remote/other_branch
> 
> 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
> 
> The commit is necessary, because merge doesn't commit anything. This
> gives you a chance to clean anything up that might not be correct after
> a merge.
> 
> bzr pull, will pull changes, and "commit" them locally, but it requires
> that the branch being pulled is a descendent of the current branch.

While this method certainly isn't bad, from a ui point of view, doesn't
it make sense to have a merge_from and a merge_to that does all this
stuff for you? ie:
bzr branch sftp://my@remote/branch local_branch
cd local_branch
<hack hack>
bzr commit -m "Made some changes"
bzr merge_to sftp://my@remote/branch

In reality, I'm totally happy with your suggested solution, just
wondering if it could be somehow more clear...

Nathaniel