[PATCH 1 of 3 STABLE] subrepo: update help for commit to reflect new default behavior

David M. Carr david at carrclan.us
Thu Nov 3 22:40:33 CDT 2011


# HG changeset patch
# User David M. Carr  <david at carrclan.us>
# Date 1320376300 14400
# Branch stable
# Node ID f2b8e4b8b84bc71a3488846157f115bb6e674e50
# Parent  db8b0ee74025f77c02b3cc9f183aca720f41a400
subrepo: update help for commit to reflect new default behavior

Update the subrepo help to be consistent with the new default behavior,
which is to abort if any subrepo is dirty.

diff -r db8b0ee74025 -r f2b8e4b8b84b mercurial/help/subrepos.txt
--- a/mercurial/help/subrepos.txt	Thu Nov 03 10:59:32 2011 -0400
+++ b/mercurial/help/subrepos.txt	Thu Nov 03 23:11:40 2011 -0400
@@ -80,12 +80,13 @@
     -S/--subrepos is specified.
 
 :commit: commit creates a consistent snapshot of the state of the
-    entire project and its subrepositories. It does this by first
-    attempting to commit all modified subrepositories, then recording
-    their state and finally committing it in the parent
-    repository. Mercurial can be made to abort if any subrepository
-    content is modified by setting "ui.commitsubrepos=no" in a
-    configuration file (see :hg:`help config`).
+    entire project and its subrepositories. If any subrepositories
+    have been modified, Mercurial will abort.  Mercurial can be made
+    to instead commit all modified subrepositories by specifying
+    -S/--subrepos, or setting "ui.commitsubrepos=True" in a
+    configuration file (see :hg:`help config`).  After there are no
+    longer any modified subrepositories, it records their state and
+    finally commits it in the parent repository.
 
 :diff: diff does not recurse in subrepos unless -S/--subrepos is
     specified. Changes are displayed as usual, on the subrepositories


More information about the Mercurial-devel mailing list