[RFC] branches are diverged: sometimes branches completely unrelated

Aaron Bentley aaron.bentley at utoronto.ca
Wed Oct 24 20:16:00 BST 2007


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

James Westby wrote:
> On (24/10/07 11:24), Alexander Belchenko wrote:
>> IMO, in this situation it's better if bzr says that branches
>> completely different so user can understand his own mistake
>> faster.

> It may be desirable to have a way (like there is for merge) to say do it
> anyway.

pull --overwrite would work.  But it seems incredibly unlikely that you
would actually want that.

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

iD8DBQFHH5nw0F+nu1YWqI0RAi7aAJ0b2aRL4Js1dUdkZTAao9JqqafLbQCeOv0P
7CptlBnXSs+WsEPpa+UBa5E=
=RCsa
-----END PGP SIGNATURE-----



More information about the bazaar mailing list