[RFC] Use KnitVersionedFile.plan_merge for all VersionedFiles

Aaron Bentley aaron.bentley at utoronto.ca
Fri Jul 14 14:11:00 BST 2006


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

Hi all,

For knit-format branches, "--merge-type weave" actually performs a knit
merge.  The behaviour of knit merge and weave merge is very similar, but
there are some small differences.  In principle, I think it would be
surprising to have merge behave differently depending on your repository
storage format.

The knit plan_merge is implemented in terms of the public VersionedFile
API, so it can support any VersionedFile, including weaves.  So I
propose turning it into VersionedFile.plan_merge, and removing
Weave.plan_merge.

If there was value remaining in weave merge, we could examine the
possibility of having both weave merge and knit merge.  But I don't
believe there's enough difference between weave merge and knit merge to
make that worthwile.

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

iD8DBQFEt5fk0F+nu1YWqI0RAs00AKCIygBVyQRhRbH2xd7CamFbM/QgiACfRIvK
Uftcl3juMwTIX3A0j1dJk48=
=ru9C
-----END PGP SIGNATURE-----




More information about the bazaar mailing list