[MERGE] Branch format 6

[Erik Bågfors]

On 2/12/07, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Erik Bågfors wrote:
>
> >> I would think the way to do it is
> >>   cd mainline
> >>   bzr pull
> >>   bzr merge ../mystuff
> >>   bzr commit -m "Merged my stuff into mainline"
> >>   bzr push
> >
> >
> > I don't think this one is so good because it's possible that someone
> > committed to mainline in the meantime.
>
> The same problem exists with bound branches, it's just that the recovery
> is different.  If push failed, you'd uncommit, pull, commit and push.


Exactly.

So...

bzr pull
bzr merge ../otherbranch
review
bzr commit -m merge
bzr push -> error message, can't do it
bzr uncommit
bzr revert
bzr pull
bzr merge ../otherbranch
review
bzr commit -m merge
bzr push

Compared to
bzr update
bzr merge ../otherbranch
review
bzr commit -m merge ---> Error message, run bzr update
bzr update
review
bzr commit -m merge

I find the second version nicer :)

/Erik - who thinks he got that right.