[merge] cleanup remerge tests
John Arbash Meinel
john at arbash-meinel.com
Thu Jun 29 17:31:49 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
The attached bundle has one small bugfix, and a bunch of test cleanup.
While trying to fix win32, I found that the remerge test was failing.
While looking deeper, I found out that the part that was succeeding was
actually an accident. We were getting retcode=3 because of the wrong reason.
So I went ahead and updated the remerge tests, moving them into their
own file, and writing run_bzr_error to make it nicer to verify we are
getting the error we expect.
I haven't fixed anything to actually work on win32 yet, but I figured
this cleanup is good enough to be merged by itself.
I also found one small bug with an error message that was missing a space.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 9006 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060629/334f0d91/attachment.bin
More information about the bazaar