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

login
register
mail settings
Submitter Angel Ezquerra
Date Jan. 29, 2014, 2:25 p.m.
Message ID <CAMefLFFrHCJBC421LSp6SmX-cOFBy5hntc5HpND3JisYASOE0g@mail.gmail.com>
Download mbox | patch
Permalink /patch/3418/
State Superseded
Commit fa6cb300ded47fa26405681b6efbf2d5cc53e111
Headers show

Comments

Angel Ezquerra - Jan. 29, 2014, 2:25 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 35b9de022a5b76f1d1ae6880502d1d7aa7b215a7
# Parent  427d672c0e4e07642d2400a28946cefde11e04ff
help: improve description of phases.checksubrepos setting

The existing description was a bit hard to understand.


 ``profiling``
 -------------
Matt Mackall - Jan. 30, 2014, 8:26 p.m.
On Wed, 2014-01-29 at 15:25 +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 35b9de022a5b76f1d1ae6880502d1d7aa7b215a7
> # Parent  427d672c0e4e07642d2400a28946cefde11e04ff
> help: improve description of phases.checksubrepos setting

Patch is linewrap damaged, which also probably means your lines are too
long.
Angel Ezquerra - Jan. 31, 2014, 8:29 a.m.
On Thu, Jan 30, 2014 at 9:26 PM, Matt Mackall <mpm@selenic.com> wrote:
> On Wed, 2014-01-29 at 15:25 +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 35b9de022a5b76f1d1ae6880502d1d7aa7b215a7
>> # Parent  427d672c0e4e07642d2400a28946cefde11e04ff
>> help: improve description of phases.checksubrepos setting
>
> Patch is linewrap damaged, which also probably means your lines are too
> long.

I just checked and the lines are all below 80 chars on my side.
I suspect the problem was that I sent the patch by copying and pasting
it into my gmail window. The patchwork extension was not working for
some reason on the PC I used to send the patch.

I'll send it again from a different PC this afternoon. Hopefully I
will send it before the release.

Cheers,

Angel

Patch

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"