Patchwork clone: move bookmarks and checkouts before pull help

login
register
mail settings
Submitter timeless@mozdev.org
Date Jan. 5, 2016, 8 p.m.
Message ID <d1518cc222945edc0aaa.1452024022@waste.org>
Download mbox | patch
Permalink /patch/12542/
State Accepted
Headers show

Comments

timeless@mozdev.org - Jan. 5, 2016, 8 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1452023961 0
#      Tue Jan 05 19:59:21 2016 +0000
# Node ID d1518cc222945edc0aaa52b6ef041e0c8c1677e0
# Parent  b8405d739149cdd6d8d9bd5e3dd2ad8487b1f09a
clone: move bookmarks and checkouts before pull help

The bookmark/checkout help actually split the pull help.
The subsequent verbose container is talking about pull too.
This change puts the pull help back together again.
Augie Fackler - Jan. 7, 2016, 12:37 a.m.
On Tue, Jan 05, 2016 at 02:00:22PM -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1452023961 0
> #      Tue Jan 05 19:59:21 2016 +0000
> # Node ID d1518cc222945edc0aaa52b6ef041e0c8c1677e0
> # Parent  b8405d739149cdd6d8d9bd5e3dd2ad8487b1f09a
> clone: move bookmarks and checkouts before pull help

Queued, thanks.

>
> The bookmark/checkout help actually split the pull help.
> The subsequent verbose container is talking about pull too.
> This change puts the pull help back together again.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -1457,6 +1457,12 @@
>      destinations. For ``ssh://`` destinations, no working directory or
>      ``.hg/hgrc`` will be created on the remote side.
>
> +    If the source repository has a bookmark called '@' set, that
> +    revision will be checked out in the new repository by default.
> +
> +    To check out a particular version, use -u/--update, or
> +    -U/--noupdate to create a clone with no working directory.
> +
>      To pull only a subset of changesets, specify one or more revisions
>      identifiers with -r/--rev or branches with -b/--branch. The
>      resulting clone will contain only the specified changesets and
> @@ -1468,12 +1474,6 @@
>         Specifying a tag will include the tagged changeset but not the
>         changeset containing the tag.
>
> -    If the source repository has a bookmark called '@' set, that
> -    revision will be checked out in the new repository by default.
> -
> -    To check out a particular version, use -u/--update, or
> -    -U/--noupdate to create a clone with no working directory.
> -
>      .. container:: verbose
>
>        For efficiency, hardlinks are used for cloning whenever the
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1457,6 +1457,12 @@ 
     destinations. For ``ssh://`` destinations, no working directory or
     ``.hg/hgrc`` will be created on the remote side.
 
+    If the source repository has a bookmark called '@' set, that
+    revision will be checked out in the new repository by default.
+
+    To check out a particular version, use -u/--update, or
+    -U/--noupdate to create a clone with no working directory.
+
     To pull only a subset of changesets, specify one or more revisions
     identifiers with -r/--rev or branches with -b/--branch. The
     resulting clone will contain only the specified changesets and
@@ -1468,12 +1474,6 @@ 
        Specifying a tag will include the tagged changeset but not the
        changeset containing the tag.
 
-    If the source repository has a bookmark called '@' set, that
-    revision will be checked out in the new repository by default.
-
-    To check out a particular version, use -u/--update, or
-    -U/--noupdate to create a clone with no working directory.
-
     .. container:: verbose
 
       For efficiency, hardlinks are used for cloning whenever the