From patchwork Fri Jan 31 21:29:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE, [V2] ] help: improve description of phases.checksubrepos setting From: Angel Ezquerra X-Patchwork-Id: 3423 Message-Id: To: mercurial-devel@selenic.com Date: Fri, 31 Jan 2014 22:29:56 +0100 # HG changeset patch # User Angel Ezquerra # 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. 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`` -------------