--- a/mercurial/help/subrepos.txt Fri Nov 04 10:32:13 2011 +0100
+++ b/mercurial/help/subrepos.txt Fri Nov 04 10:39:04 2011 +0100
@@ -75,32 +75,33 @@
:add: add does not recurse in subrepos unless -S/--subrepos is
specified. However, if you specify the full path of a file in a
subrepo, it will be added even without -S/--subrepos specified.
- Subversion subrepositories are currently silently
+ Git and Subversion subrepositories are currently silently
ignored.
:archive: archive does not recurse in subrepositories unless
-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
- elements. Subversion subrepositories are currently silently
- ignored.
+ elements. Git and Subversion subrepositories are currently
+ silently ignored.
:incoming: incoming does not recurse in subrepos unless -S/--subrepos
- is specified. Subversion subrepositories are currently silently
- ignored.
+ is specified. Git and Subversion subrepositories are currently
+ silently ignored.
:outgoing: outgoing does not recurse in subrepos unless -S/--subrepos
- is specified. Subversion subrepositories are currently silently
- ignored.
+ is specified. Git and Subversion subrepositories are currently
+ silently ignored.
:pull: pull is not recursive since it is not clear what to pull prior
to running :hg:`update`. Listing and retrieving all
@@ -111,7 +112,7 @@
:push: Mercurial will automatically push all subrepositories first
when the parent repository is being pushed. This ensures new
subrepository changes are available when referenced by top-level
- repositories.
+ repositories. Push is a no-op for Subversion subrepositories.
:status: status does not recurse into subrepositories unless
-S/--subrepos is specified. Subrepository changes are displayed as