Patchwork [STABLE] help: do not suggest "update --clean ." to cancel uncommitted merge

login
register
mail settings
Submitter Yuya Nishihara
Date Jan. 23, 2018, 12:29 p.m.
Message ID <4e1c8beb9b7abf6b9add.1516710585@mimosa>
Download mbox | patch
Permalink /patch/27054/
State Accepted
Headers show

Comments

Yuya Nishihara - Jan. 23, 2018, 12:29 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1516709676 -32400
#      Tue Jan 23 21:14:36 2018 +0900
# Branch stable
# Node ID 4e1c8beb9b7abf6b9addc64a59da186a8b3857d2
# Parent  de23345e2b6b880880896e27e5e2f745efa3799b
help: do not suggest "update --clean ." to cancel uncommitted merge

Follows up 41ef02ba329b.
Pulkit Goyal - Jan. 25, 2018, 11:55 a.m.
Looks good to me. Thanks.

On Tue, Jan 23, 2018 at 5:59 PM, Yuya Nishihara <yuya@tcha.org> wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1516709676 -32400
> #      Tue Jan 23 21:14:36 2018 +0900
> # Branch stable
> # Node ID 4e1c8beb9b7abf6b9addc64a59da186a8b3857d2
> # Parent  de23345e2b6b880880896e27e5e2f745efa3799b
> help: do not suggest "update --clean ." to cancel uncommitted merge
>
> Follows up 41ef02ba329b.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4560,7 +4560,7 @@ def revert(ui, repo, *pats, **opts):
>
>         To check out earlier revisions, you should use :hg:`update REV`.
>         To cancel an uncommitted merge (and lose your changes),
> -       use :hg:`update --clean .`.
> +       use :hg:`merge --abort`.
>
>      With no revision specified, revert the specified files or directories
>      to the contents they had in the parent of the working directory.
> @@ -5501,7 +5501,7 @@ def update(ui, repo, node=None, rev=None
>           the working directory is updated to the requested changeset.
>
>      To cancel an uncommitted merge (and lose your changes), use
> -    :hg:`update --clean .`.
> +    :hg:`merge --abort`.
>
>      Use null as the changeset to remove the working directory (like
>      :hg:`clone -U`).
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Augie Fackler - Jan. 26, 2018, 5:09 a.m.
queued for stable, thanks

> On Jan 25, 2018, at 06:55, Pulkit Goyal <7895pulkit@gmail.com> wrote:
> 
> Looks good to me. Thanks.
> 
> On Tue, Jan 23, 2018 at 5:59 PM, Yuya Nishihara <yuya@tcha.org> wrote:
>> # HG changeset patch
>> # User Yuya Nishihara <yuya@tcha.org>
>> # Date 1516709676 -32400
>> #      Tue Jan 23 21:14:36 2018 +0900
>> # Branch stable
>> # Node ID 4e1c8beb9b7abf6b9addc64a59da186a8b3857d2
>> # Parent  de23345e2b6b880880896e27e5e2f745efa3799b
>> help: do not suggest "update --clean ." to cancel uncommitted merge
>> 
>> Follows up 41ef02ba329b.
>> 
>> diff --git a/mercurial/commands.py b/mercurial/commands.py
>> --- a/mercurial/commands.py
>> +++ b/mercurial/commands.py
>> @@ -4560,7 +4560,7 @@ def revert(ui, repo, *pats, **opts):
>> 
>>        To check out earlier revisions, you should use :hg:`update REV`.
>>        To cancel an uncommitted merge (and lose your changes),
>> -       use :hg:`update --clean .`.
>> +       use :hg:`merge --abort`.
>> 
>>     With no revision specified, revert the specified files or directories
>>     to the contents they had in the parent of the working directory.
>> @@ -5501,7 +5501,7 @@ def update(ui, repo, node=None, rev=None
>>          the working directory is updated to the requested changeset.
>> 
>>     To cancel an uncommitted merge (and lose your changes), use
>> -    :hg:`update --clean .`.
>> +    :hg:`merge --abort`.
>> 
>>     Use null as the changeset to remove the working directory (like
>>     :hg:`clone -U`).
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4560,7 +4560,7 @@  def revert(ui, repo, *pats, **opts):
 
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes),
-       use :hg:`update --clean .`.
+       use :hg:`merge --abort`.
 
     With no revision specified, revert the specified files or directories
     to the contents they had in the parent of the working directory.
@@ -5501,7 +5501,7 @@  def update(ui, repo, node=None, rev=None
          the working directory is updated to the requested changeset.
 
     To cancel an uncommitted merge (and lose your changes), use
-    :hg:`update --clean .`.
+    :hg:`merge --abort`.
 
     Use null as the changeset to remove the working directory (like
     :hg:`clone -U`).