Patchwork [3,of,3] commit: reorder help text

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 15, 2015, 7:58 a.m.
Message ID <917d8b84d54e08b040b5.1450166326@waste.org>
Download mbox | patch
Permalink /patch/12055/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 15, 2015, 7:58 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450166224 0
#      Tue Dec 15 07:57:04 2015 +0000
# Node ID 917d8b84d54e08b040b51d8158cec2967e9d493f
# Parent  1539b8321dcbda6e19681b68a7b9adf3617fb65a
commit: reorder help text

Try to place key concepts early+together.
Matt Mackall - Dec. 16, 2015, 11:29 p.m.
On Tue, 2015-12-15 at 01:58 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1450166224 0
> #      Tue Dec 15 07:57:04 2015 +0000
> # Node ID 917d8b84d54e08b040b51d8158cec2967e9d493f
> # Parent  1539b8321dcbda6e19681b68a7b9adf3617fb65a
> commit: reorder help text

These are queued with s/commit/import/ in the summaries.
-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4569,8 +4569,17 @@ 
     Import a list of patches and commit them individually (unless
     --no-commit is specified).
 
-    Because import first applies changes to the working directory,
-    import will abort if there are outstanding changes.
+    To read a patch from standard input, use "-" as the patch name. If
+    a URL is specified, the patch will be downloaded from there.
+
+    Import first applies changes to the working directory (unless
+    --bypass is specified), import will abort if there are outstanding
+    changes.
+
+    Use --bypass to apply and commit patches directly to the
+    repository, without affecting the working directory. Without
+    --exact, patches will be applied on top of the working directory
+    parent revision.
 
     You can import a patch straight from a mail message. Even patches
     as attachments work (to use the body part, it must have type
@@ -4590,14 +4599,6 @@ 
     the patch. This may happen due to character set problems or other
     deficiencies in the text patch format.
 
-    Use --bypass to apply and commit patches directly to the
-    repository, not touching the working directory. Without --exact,
-    patches will be applied on top of the working directory parent
-    revision.
-
-    With -s/--similarity, hg will attempt to discover renames and
-    copies in the patch in the same way as :hg:`addremove`.
-
     Use --partial to ensure a changeset will be created from the patch
     even if some hunks fail to apply. Hunks that fail to apply will be
     written to a <target-file>.rej file. Conflicts can then be resolved
@@ -4608,14 +4609,15 @@ 
     cleanly, :hg:`import --partial` will create an empty changeset,
     importing only the patch metadata.
 
+    With -s/--similarity, hg will attempt to discover renames and
+    copies in the patch in the same way as :hg:`addremove`.
+
     It is possible to use external patch programs to perform the patch
     by setting the ``ui.patch`` configuration option. For the default
     internal tool, the fuzz can also be configured via ``patch.fuzz``.
     See :hg:`help config` for more information about configuration
     files and how to use these options.
 
-    To read a patch from standard input, use "-" as the patch name. If
-    a URL is specified, the patch will be downloaded from it.
     See :hg:`help dates` for a list of formats valid for -d/--date.
 
     .. container:: verbose