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

[John Arbash Meinel]

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

Aaron Bentley wrote:
> John Arbash Meinel wrote:
>> Aaron Bentley wrote:
>>> Now that there's there's an automatic behavior, it's a shame not to
>>> provide a way specify the auto behavior.  e.g. --reprocess,
>>> --no-reprocess and --auto-reprocess.
> 
>> Well, '--no-reprocess' works just fine (as it is a simple boolean
>> option.) Is there something else you would want?
> 
> If I have aliased "merge" to "merge --reprocess", I want a way to force
> it back to the default behavior, without using --no-aliases.
> 
> Aaron

'bzr merge --reprocess --no-reprocess' does just that.

But I guess you're asking for a way to hide the parameter you gave (in
the alias)

I've run into that elsewhere, I have 'log = log -r -10..-1 --short', and
now I just tried to do "bzr log -c X" to try it out, but it fails
because "-c" and "-r" are "incompatible".

I'm not sure if there is a great answer. It seems like we would need
finer control about how options are parsed and what overrides what.

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

iEYEARECAAYFAkjkOXAACgkQJdeBCYSNAAP+rwCfdsmzQMv5ZN/gTasvyaLMg6OF
kZIAoJMbX3753peOaRpOujSxWPQ2htg1
=aWjm
-----END PGP SIGNATURE-----