[PATCH V2 RESEND] backout: commit changeset by default (BC)

[Matt Mackall]

On Tue, 2016-01-12 at 16:32 -0800, Ruslan Sayfutdinov wrote:
> # HG changeset patch
> # User Ruslan Sayfutdinov <sayfutdinov at fb.com>
> # Date 1450781391 28800
> #      Tue Dec 22 02:49:51 2015 -0800
> # Node ID 79165239ca34a306102ae017f9758f3220a61b9b
> # Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
> backout: commit changeset by default (BC)
> 
> Add --no-commit flag to prevent it. This should make the hg user experience a
> little better.
> Some discussion can be found here: http://markmail.org/message/7jm7ro2ias6hxyw
> y

Not sure why no one else picked this up over the holidays, but I still have your
original in my inbox so I would have gotten to it eventually.

>  @command('backout',
>      [('', 'merge', None, _('merge with old dirstate parent after backout')),
> -    ('', 'commit', None, _('commit if no conflicts were encountered')),

Removing the old option is bad, because now anyone who has it hard-coded in an
alias, script, GUI, etc.. is needlessly broken. Instead, just mark it
(DEPRECATED) to hide it in the help and ignore it. Perhaps check that both
options aren't specified. Otherwise, the patch is fine. 

-- 
Mathematics is the supreme nostalgia of our time.