[MERGE] Branch format 6

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Nicholas Allen wrote:
> 
>> I'm not sure 'strict history' really conveys the meaning of this though.
>> In that bug john suggests 'preserve_mainline' -- how is that for you?

> How about 'preserve_revision_numbers'? That's how it appears to the user
> that the revnos don't change.

I don't like that because it seems too narrow.  For me, the primary
thing is that it preserves the view I get from "bzr log".  The fact that
it preserves revision numbers is secondary for me.

> Or maybe 'append_revisions_only' , 'append_revision_numbers' ,
> 'keep_revision_numbers'....

Of those, I like "append_revisions_only" the best.

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

iD8DBQFF0ImS0F+nu1YWqI0RAt8NAJ90eaUSgOLPb6YypNPKndIzXgWFowCeO9yK
C7yJ3vMEb2uVmo6Fjpu4A10=
=Jj0h
-----END PGP SIGNATURE-----