[MERGE] [0.90] Disable patch verification (broken for CRLF files)
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Aug 13 22:31:42 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John Arbash Meinel wrote:
> Aaron Bentley wrote:
> What does it actually cause when merging a "broken" bundle?
When patch verification fails, it returns "inapplicable", which means
that the format "doesn't support patch verification".
All previous formats didn't support patch verification, and neither does
Merge Directive 2 if there is no patch to verify. So the merge
directive is installed and merged, but the library knows that it hasn't
actually been verified.
> I can see that you return "inapplicable", but I don't know if that means
> it aborts, or does something else. (I think it means that you are saying
> it verification isn't really possible for this object.)
> BB:approve
Thanks.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGwM2+0F+nu1YWqI0RAoZsAJ0cnIvzJ6hEtmibhr8DBk6nwitXewCdG3Oz
LAM3/H7DeWkfe98DgNun6TU=
=hnGv
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list