[PATCH 1 of 1 STABLE] help: improve description of phases.checksubrepos setting

Angel Ezquerra angel.ezquerra at gmail.com
Wed Jan 29 08:25:22 CST 2014


# HG changeset patch
# User Angel Ezquerra <angel.ezquerra at gmail.com>
# Date 1391004996 -3600
#      Wed Jan 29 15:16:36 2014 +0100
# Branch stable
# Node ID 35b9de022a5b76f1d1ae6880502d1d7aa7b215a7
# Parent  427d672c0e4e07642d2400a28946cefde11e04ff
help: improve description of phases.checksubrepos setting

The existing description was a bit hard to understand.

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -947,12 +947,15 @@

 ``checksubrepos``

-    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".
+    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"

 ``profiling``
 -------------


More information about the Mercurial-devel mailing list