[MERGE] Branch format 6

[Erik Bågfors]

> > Basically, If I want to push to a branch that has this property, I have
> > to run
> >
> > bzr push --> Generates an error message telling me to bind
> > bzr bind
> > bzr update
> > bzr commit
> > bzr unbind
> >
> > This is because I don't want to leave my branch bound.
>
> I would think the way to do it is
> - - keep a mirror of the mainline
> - - When you want to merge into the mainline
>   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.

> Or if the mirror was a bound branch:
>   cd mainline
>   bzr update
>   bzr merge ../mystuff
>   bzr commit -m "Merged my stuff into mainline"

This is what I currently do, and I think it's a good way of doing it.
But for new users, setting up a checkout, learning about how they
work, etc, should not be required.

/Erik