[MERGE REVIEW] plan-merge for knits

[Aaron Bentley]

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

Hi all,

This patch implements plan_merge for knits, which means knits have
native weave merge support.  This means it doesn't use
VersionedFile.walk, which cannot be implemented efficiently on knits.

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

iD8DBQFERYIw0F+nu1YWqI0RAhi2AJ90Sek67tT67O2DDQRwWiSbJsaN8wCfR7uQ
+ouU4FppckioXxLDinNb9W8=
=YZ5J
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: knit-plan-merge.patch
Type: text/x-patch
Size: 23177 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060418/be98be53/attachment.bin