Mercurial > hg
comparison mercurial/help/subrepos.txt @ 15432:2ddae301d0a2
merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 04 Nov 2011 10:39:04 +0100 |
| parents | 9e99d2bbb1b1 e48f0913f018 |
| children | 95174c381525 |
comparison
equal
deleted
inserted
replaced
| 15431:c41055249725 | 15432:2ddae301d0a2 |
|---|---|
| 73 ----------------------------------- | 73 ----------------------------------- |
| 74 | 74 |
| 75 :add: add does not recurse in subrepos unless -S/--subrepos is | 75 :add: add does not recurse in subrepos unless -S/--subrepos is |
| 76 specified. However, if you specify the full path of a file in a | 76 specified. However, if you specify the full path of a file in a |
| 77 subrepo, it will be added even without -S/--subrepos specified. | 77 subrepo, it will be added even without -S/--subrepos specified. |
| 78 Subversion subrepositories are currently silently | 78 Git and Subversion subrepositories are currently silently |
| 79 ignored. | 79 ignored. |
| 80 | 80 |
| 81 :archive: archive does not recurse in subrepositories unless | 81 :archive: archive does not recurse in subrepositories unless |
| 82 -S/--subrepos is specified. | 82 -S/--subrepos is specified. |
| 83 | 83 |
| 84 :commit: commit creates a consistent snapshot of the state of the | 84 :commit: commit creates a consistent snapshot of the state of the |
| 85 entire project and its subrepositories. It does this by first | 85 entire project and its subrepositories. If any subrepositories |
| 86 attempting to commit all modified subrepositories, then recording | 86 have been modified, Mercurial will abort. Mercurial can be made |
| 87 their state and finally committing it in the parent | 87 to instead commit all modified subrepositories by specifying |
| 88 repository. Mercurial can be made to abort if any subrepository | 88 -S/--subrepos, or setting "ui.commitsubrepos=True" in a |
| 89 content is modified by setting "ui.commitsubrepos=no" in a | 89 configuration file (see :hg:`help config`). After there are no |
| 90 configuration file (see :hg:`help config`). | 90 longer any modified subrepositories, it records their state and |
| 91 finally commits it in the parent repository. | |
| 91 | 92 |
| 92 :diff: diff does not recurse in subrepos unless -S/--subrepos is | 93 :diff: diff does not recurse in subrepos unless -S/--subrepos is |
| 93 specified. Changes are displayed as usual, on the subrepositories | 94 specified. Changes are displayed as usual, on the subrepositories |
| 94 elements. Subversion subrepositories are currently silently | 95 elements. Git and Subversion subrepositories are currently |
| 95 ignored. | 96 silently ignored. |
| 96 | 97 |
| 97 :incoming: incoming does not recurse in subrepos unless -S/--subrepos | 98 :incoming: incoming does not recurse in subrepos unless -S/--subrepos |
| 98 is specified. Subversion subrepositories are currently silently | 99 is specified. Git and Subversion subrepositories are currently |
| 99 ignored. | 100 silently ignored. |
| 100 | 101 |
| 101 :outgoing: outgoing does not recurse in subrepos unless -S/--subrepos | 102 :outgoing: outgoing does not recurse in subrepos unless -S/--subrepos |
| 102 is specified. Subversion subrepositories are currently silently | 103 is specified. Git and Subversion subrepositories are currently |
| 103 ignored. | 104 silently ignored. |
| 104 | 105 |
| 105 :pull: pull is not recursive since it is not clear what to pull prior | 106 :pull: pull is not recursive since it is not clear what to pull prior |
| 106 to running :hg:`update`. Listing and retrieving all | 107 to running :hg:`update`. Listing and retrieving all |
| 107 subrepositories changes referenced by the parent repository pulled | 108 subrepositories changes referenced by the parent repository pulled |
| 108 changesets is expensive at best, impossible in the Subversion | 109 changesets is expensive at best, impossible in the Subversion |
| 109 case. | 110 case. |
| 110 | 111 |
| 111 :push: Mercurial will automatically push all subrepositories first | 112 :push: Mercurial will automatically push all subrepositories first |
| 112 when the parent repository is being pushed. This ensures new | 113 when the parent repository is being pushed. This ensures new |
| 113 subrepository changes are available when referenced by top-level | 114 subrepository changes are available when referenced by top-level |
| 114 repositories. | 115 repositories. Push is a no-op for Subversion subrepositories. |
| 115 | 116 |
| 116 :status: status does not recurse into subrepositories unless | 117 :status: status does not recurse into subrepositories unless |
| 117 -S/--subrepos is specified. Subrepository changes are displayed as | 118 -S/--subrepos is specified. Subrepository changes are displayed as |
| 118 regular Mercurial changes on the subrepository | 119 regular Mercurial changes on the subrepository |
| 119 elements. Subversion subrepositories are currently silently | 120 elements. Subversion subrepositories are currently silently |