Mercurial > hg
comparison mercurial/help/config.txt @ 20333:fa6cb300ded4 stable
help: improve description of phases.checksubrepos setting
The existing description was a bit hard to understand.
author | Angel Ezquerra <angel.ezquerra@gmail.com> |
---|---|
date | Wed, 29 Jan 2014 15:16:36 +0100 |
parents | 4c96c50ef937 |
children | 4e41b2fe46cc |
comparison
equal
deleted
inserted
replaced
20332:a959f7167077 | 20333:fa6cb300ded4 |
---|---|
944 ``new-commit`` | 944 ``new-commit`` |
945 Phase of newly-created commits. | 945 Phase of newly-created commits. |
946 Default: draft | 946 Default: draft |
947 | 947 |
948 ``checksubrepos`` | 948 ``checksubrepos`` |
949 | 949 Check the phase of the current revision of each subrepository. Allowed |
950 Check phase of state in each subrepositories, allowed values are | 950 values are "ignore", "follow" and "abort". For settings other than |
951 "ignore", "follow" or "abort". For settings other than "ignore", | 951 "ignore", the phase of the current revision of each subrepository is |
952 the phase of each subrepository commit is checked before committing | 952 checked before committing the parent repository. If any of those phases is |
953 in the parent repository. If there is any greater phase than the parent | 953 greater than the phase of the parent repository (e.g. if a subrepo is in a |
954 ("secret" vs "draft", for example), the commit is either aborted | 954 "secret" phase while the parent repo is in "draft" phase), the commit is |
955 with "abort" or the higher phase is used with "follow". Default: "follow". | 955 either aborted (if checksubrepos is set to "abort") or the higher phase is |
956 used for the parent repository commit (if set to "follow"). | |
957 Default: "follow" | |
958 | |
956 | 959 |
957 ``profiling`` | 960 ``profiling`` |
958 ------------- | 961 ------------- |
959 | 962 |
960 Specifies profiling type, format, and file output. Two profilers are | 963 Specifies profiling type, format, and file output. Two profilers are |