Patchwork [STABLE,[V2] ] help: improve description of phases.checksubrepos setting

login
register
mail settings
Submitter Angel Ezquerra
Date Jan. 31, 2014, 9:29 p.m.
Message ID <aa6b8372edda934894ce.1391203796@Angel-PC.localdomain>
Download mbox | patch
Permalink /patch/3423/
State Accepted
Commit fa6cb300ded47fa26405681b6efbf2d5cc53e111
Headers show

Comments

Angel Ezquerra - Jan. 31, 2014, 9:29 p.m.
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1391004996 -3600
#      Wed Jan 29 15:16:36 2014 +0100
# Branch stable
# Node ID aa6b8372edda934894cee9381c84f5cd33366010
# Parent  a959f71670771a9dae97e73ec86da222950233a4
help: improve description of phases.checksubrepos setting

The existing description was a bit hard to understand.
Matt Mackall - Jan. 31, 2014, 9:32 p.m.
On Fri, 2014-01-31 at 22:29 +0100, Angel Ezquerra wrote:
> # HG changeset patch
> # User Angel Ezquerra <angel.ezquerra@gmail.com>
> # Date 1391004996 -3600
> #      Wed Jan 29 15:16:36 2014 +0100
> # Branch stable
> # Node ID aa6b8372edda934894cee9381c84f5cd33366010
> # Parent  a959f71670771a9dae97e73ec86da222950233a4
> help: improve description of phases.checksubrepos setting

Queued for stable, thanks.

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -946,13 +946,16 @@ 
     Default: draft
 
 ``checksubrepos``
+    Check the phase of the current revision of each subrepository. Allowed
+    values are "ignore", "follow" and "abort". For settings other than
+    "ignore", the phase of the current revision of each subrepository is
+    checked before committing the parent repository. If any of those phases is
+    greater than the phase of the parent repository (e.g. if a subrepo is in a
+    "secret" phase while the parent repo is in "draft" phase), the commit is
+    either aborted (if checksubrepos is set to "abort") or the higher phase is
+    used for the parent repository commit (if set to "follow").
+    Default: "follow"
 
-    Check phase of state in each subrepositories, allowed values are
-    "ignore", "follow" or "abort". For settings other than "ignore",
-    the phase of each subrepository commit is checked before committing
-    in the parent repository. If there is any greater phase than the parent
-    ("secret" vs "draft", for example), the commit is either aborted
-    with "abort" or the higher phase is used with "follow". Default: "follow".
 
 ``profiling``
 -------------