[PATCH] make 'hg backout' commit by default

Sean Farley sean at farley.io
Mon Dec 21 13:02:39 CST 2015


Ruslan Sayfutdinov <sayfutdinov at fb.com> writes:

> # HG changeset patch
> # User Ruslan Sayfutdinov <sayfutdinov at fb.com>
> # Date 1450720407 28800
> #      Mon Dec 21 09:53:27 2015 -0800
> # Node ID 1a867c6911ea5fea8d37771f656ec3f51aa44da9
> # Parent  2916ebaef3129451bfd4f9f62487e70f74124d46
> make 'hg backout' commit by default

Thanks for your first patch! A quick tip for guidelines about
contributing is to read the info on this page:

https://www.mercurial-scm.org/wiki/ContributingChanges

For instance, see (1) ("first line of commit message is of the form
'topic: uncapitalized, no trailing period').

> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -522,22 +522,22 @@
>  
>  @command('backout',
>      [('', 'merge', None, _('merge with old dirstate parent after backout')),
> -    ('', 'commit', None, _('commit if no conflicts were encountered')),
> +    ('', 'no-commit', None, _('do not commit')),

This is quite a big behavioral change, so you'll need at the very least
to append "(BC)" to the topic line (see section 7 in the link above).

Before I go any further with your patch, I'm going to point to you the
previous discussion on this topic:

Issue 2259: http://bz.mercurial-scm.org/show_bug.cgi?id=2259

Others will probably have opinions on this topic, fyi.


More information about the Mercurial-devel mailing list