[MERGE] 'bzr merge' defaults to '--reprocess'

[John Arbash Meinel]

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

IIRC, the reason we didn't default --reprocess was because it conflicts
with '--show-base'. So I updated cmd_merge so that it defaults reprocess
 = None (not selected) and then sets it to True/False when it goes to
make sure all the parameters are reasonable.

I added tests for this behavior. The one bit I didn't test was that it
defaults reprocess=False if the merge format doesn't support it. I
didn't test it because all of our current algorithms support reprocess.

Also, I was thinking about testing some of this at the
"bzrlib.tests.commands.test_merge" rather than as blackbox tests.
Basically, whitebox testing the cmd_merge.sanity_check_merger()
function. It wasn't going to be easier to do so I punted to where I'm
more comfortable. Thoughts?

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjhXu0ACgkQJdeBCYSNAAN/+gCgg7owepPKfQiAW4vH3ECpxQyL
p3oAnjKcEFOgpAf52YPxaQBumSYmeKlT
=/T/Y
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: merge_reprocess.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080929/f1193110/attachment.diff