[ANN][RFC] plugin package: ezbzr

[Nathaniel McCallum]

On Thu, 2006-01-19 at 08:44 +0100, Jan Hudec wrote:
> On Wed, Jan 18, 2006 at 13:43:46 -0500, Nathaniel McCallum wrote:
> >   3. release (new) -- Merges local branch into remote branches
> 
> How does this work? From the description it sounds scary.
> 
> Basically I don't see what you could do other than:
> local-branch$ bzr merge remote-branch
> (there should be a --reverse-parents option here, so the remote parent
>  is recorded as first one)
> local-branch$ bzr commit -m 'Merging into mainline'
> local-branch$ bzr push remote-branch

Its not scary, its just basically a shortcut for:
$ TEMP=`mktemp`
$ cd $TEMP
$ branch --basis=mybranch sftp://foo//bar
$ cd bar
$ bzr merge mybranch
$ bzr commit "Merged into mainline"
$ bzr push
$ cd $orig_dir
$ rm -rf $TEMP

If conflicts occur, the temp directory is left alone and instructions on
how to proceed are printed on the screen.

Nathaniel