Patchwork histedit: fix grammar for help for safety aborts

login
register
mail settings
Submitter timeless@mozdev.org
Date Aug. 28, 2015, 3:33 p.m.
Message ID <62e936764c97e2cd5ea0.1440775989@waste.org>
Download mbox | patch
Permalink /patch/10315/
State Accepted
Headers show

Comments

timeless@mozdev.org - Aug. 28, 2015, 3:33 p.m.
# HG changeset patch
# User timeless@mozdev.org
# Date 1440775904 14400
#      Fri Aug 28 11:31:44 2015 -0400
# Node ID 62e936764c97e2cd5ea0fd1896dd2a77a8ee9d02
# Parent  e7e7182564f60622bd98083e94af3da74d597eaa
histedit: fix grammar for help for safety aborts
Augie Fackler - Aug. 28, 2015, 5:29 p.m.
On Fri, Aug 28, 2015 at 10:33:09AM -0500, timeless@mozdev.org wrote:
> # HG changeset patch
> # User timeless@mozdev.org
> # Date 1440775904 14400
> #      Fri Aug 28 11:31:44 2015 -0400
> # Node ID 62e936764c97e2cd5ea0fd1896dd2a77a8ee9d02
> # Parent  e7e7182564f60622bd98083e94af3da74d597eaa
> histedit: fix grammar for help for safety aborts

queued, many thanks

>
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -675,9 +675,9 @@
>      destination repository. If URL of the destination is omitted, the
>      'default-push' (or 'default') path will be used.
>
> -    For safety, this command is aborted, also if there are ambiguous
> -    outgoing revisions which may confuse users: for example, there are
> -    multiple branches containing outgoing revisions.
> +    For safety, this command is also aborted if there are ambiguous
> +    outgoing revisions which may confuse users: for example, if there
> +    are multiple branches containing outgoing revisions.
>
>      Use "min(outgoing() and ::.)" or similar revset specification
>      instead of --outgoing to specify edit target revision exactly in
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -675,9 +675,9 @@ 
     destination repository. If URL of the destination is omitted, the
     'default-push' (or 'default') path will be used.
 
-    For safety, this command is aborted, also if there are ambiguous
-    outgoing revisions which may confuse users: for example, there are
-    multiple branches containing outgoing revisions.
+    For safety, this command is also aborted if there are ambiguous
+    outgoing revisions which may confuse users: for example, if there
+    are multiple branches containing outgoing revisions.
 
     Use "min(outgoing() and ::.)" or similar revset specification
     instead of --outgoing to specify edit target revision exactly in