[MERGE] Branch format 6

[Aaron Bentley]

-----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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFF0JNu0F+nu1YWqI0RAgWDAKCBqkv/zrcrgSk/scQPc+cA/pBe+ACfbX0c
pognyU9E17Czp6s8ALeqIB8=
=e1pc
-----END PGP SIGNATURE-----