[MERGE] [0.90] Disable patch verification (broken for CRLF files)
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Aug 13 18:58:16 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John Arbash Meinel wrote:
> I'm not sure why you couldn't just have something like:
>
> tree1 = self.make_branch_and_tree('tree1')
> self.build_tree_contents([('tree1/a', 'text\nfor\na\n'),
> ('tree1/b', 'text\r\nfor\r\nb\r\n')])
> tree1.add(['a', 'b'])
> rev_id = tree.commit('message')
>
> # create a bundle for rev_id versus None
> # verify that you can install the given bundle
>
> There are other edge cases, like updating a and b so that they have real
> differences.
>
> Further, you could do things like take the bundle text, and change all
> line endings, etc. So that you know it is safe even if the email/etc
> munges things.
If you look at test_patch_verification (test_merge_directive: 623) it
already does something like that. I was trying to alter it so that one
of the source files had \r line endings. It failed around the
conversion to DOS line-endings.
To answer your question, you can have a test like that. I just can't
get a test like that to pass.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGwJu40F+nu1YWqI0RAn65AJwO7g36TkaWT/YmfEMfD0O/B5NNMwCeJdfK
FniiN5rBCJqCIPNRlZNL//o=
=SrB2
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list