Bundle Buggy and patches
Aaron Bentley
aaron.bentley at utoronto.ca
Fri Nov 3 15:13:25 GMT 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Bundle Buggy can robustly detect merges of bundles, because it reads the
bundles and determines their revision ids. (It can also detect bundles
that supersede other bundles.)
It can't currently detect merges of patches, but I think I know how it
could:
1. Determine which files the patch wants to add lines to, and which
lines it wants to add.
2. Look for those lines in the files. If present and unique, use
annotations to find out which revision introduced them.
3. Compare the revision to its lefthand parent. If the diff is the same
(or very similar?) as the source patch, consider the source patch merged.
Anyone feel like implementing that? I'd like to get back to actually
coding on bzr...
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFFS1yV0F+nu1YWqI0RAl7RAJ4lC6RMXOB1Jo6qaLr3jIm/h2Y/vQCeODwb
iVsuZ+ePyitrJTGf4BQiHn0=
=eWW1
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list