[RFC] branches are diverged: sometimes branches completely unrelated
Aaron Bentley
aaron.bentley at utoronto.ca
Wed Oct 24 14:02:52 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
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.
I agree. Although technically all branches are related through the null
revision, the user model is that the branches are unrelated.
For example, when a user tries to merge two branches have only the null
revision as a common ancestor, we report that they have no common ancestor.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHH0J80F+nu1YWqI0RAqrNAJ9VH2OhKmwgQk5HIcxMhYulAiQIfgCeN6HE
npeWza+LRS3R15+2DpDFCoI=
=Am8h
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list