Mercurial > public > mercurial-scm > hg-stable
diff tests/test-subrepo.t @ 15321:e174353e8cda stable
subrepos: abort commit by default if a subrepo is dirty (BC)
This changeset flips the default value of ui.commitsubrepos setting
from True to False and adds a --subrepos flag to commit.
The commit, status, and diff commands behave like this with regard to
recusion and the ui.commitsubrepos setting:
| recurses | recurses
| by default | with --subrepos
--------+---------------+----------------
commit: | commitsubrepo | True
status: | False | True
diff: | False | True
By changing the default from True to False, the table becomes
consistent in the two columns:
* without --subrepos on the command line, commit will abort if a
subrepo is dirty and status/diff wont show changes inside subrepos.
* with --subrepos, all three commands will recurse.
A --subrepos flag on the command line overrides the config settin.g
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 21 Oct 2011 00:33:08 +0200 |
parents | 460135339d74 |
children | 83c2e6772408 41885892796e |
line wrap: on
line diff
--- a/tests/test-subrepo.t Thu Oct 20 17:05:13 2011 -0400 +++ b/tests/test-subrepo.t Fri Oct 21 00:33:08 2011 +0200 @@ -1,3 +1,8 @@ +Let commit recurse into subrepos by default to match pre-2.0 behavior: + + $ echo "[ui]" >> $HGRCPATH + $ echo "commitsubrepos = Yes" >> $HGRCPATH + $ rm -rf sub $ mkdir sub $ cd sub @@ -107,6 +112,7 @@ $ echo c > s/a $ hg --config ui.commitsubrepos=no ci -m4 abort: uncommitted changes in subrepo s + (use --subrepos for recursive commit) [255] $ hg ci -m4 committing subrepository s