Bundle Buggy supports merge directives

Aaron Bentley aaron.bentley at utoronto.ca
Sun Mar 11 04:30:50 GMT 2007


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

Aaron Bentley wrote:

> The message contains a diff, no determined the revision id.  The other
> new thing is that it displays the source branch.

Err, once more in English:

I have also added support for merge directives to Bundle Buggy, as you
can see from this request's URL:

http://bundlebuggy.aaronbentley.com/request/%3C45F35C6F.3080501%40utoronto.ca%3E

The message contains a diff, not a bundle, but BundleBuggy marks
tracking as "auto", because it determined the revision id from the merge
directive.

One drawback of diff merge directives is that they don't mark earlier
versions as "superseded".  That will require querying the source branch,
but I probably will do it.

The other new thing is that it displays the source branch, also
determined from the merge directive.

Finally, I've tweaked the gpg signature-stripping code to fix leading
hyphens that gpg mutilates.

So please everybody, give merge directives a shot and let me know what
you think.  (And don't gpg-sign them.  Bundle Buggy can't handle that yet).

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

iD8DBQFF84X60F+nu1YWqI0RAhsHAKCJeZl9Qvzw5Ulmb1T/BLHYf9CTqQCfQvFv
fF7gYB72Y7qT82yPlCEwvRs=
=5z8e
-----END PGP SIGNATURE-----



More information about the bazaar mailing list