Mercurial > hg
diff tests/test-update-branches.t @ 34705:23ed47a895d5
config: graduate experimental.updatecheck to commands.update.check
.. feature::
New `commands.update.check` feature to adjust constraints on when
`hg update` will allow updates with a dirty working copy.
also
.. bc::
The `experimental.updatecheck` name for the new `commands.update.check`
feature is now deprecated, and will be removed after this release.
Differential Revision: https://phab.mercurial-scm.org/D1070
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 14 Oct 2017 03:13:50 -0400 |
parents | 6c1a9fd8361b |
children | 1644623ab096 |
line wrap: on
line diff
--- a/tests/test-update-branches.t Sat Oct 14 15:42:38 2017 -0400 +++ b/tests/test-update-branches.t Sat Oct 14 03:13:50 2017 -0400 @@ -198,8 +198,8 @@ parent=1 M foo - $ echo '[experimental]' >> .hg/hgrc - $ echo 'updatecheck = abort' >> .hg/hgrc + $ echo '[commands]' >> .hg/hgrc + $ echo 'update.check = abort' >> .hg/hgrc $ revtest 'none dirty linear' dirty 1 2 abort: uncommitted changes @@ -215,7 +215,7 @@ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 - $ echo 'updatecheck = none' >> .hg/hgrc + $ echo 'update.check = none' >> .hg/hgrc $ revtest 'none dirty cross' dirty 3 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -258,7 +258,7 @@ >>>>>>> destination: d047485b3896 b1 - test: 4 $ rm a.orig - $ echo 'updatecheck = noconflict' >> .hg/hgrc + $ echo 'update.check = noconflict' >> .hg/hgrc $ revtest 'none dirty cross' dirty 3 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -315,7 +315,7 @@ $ hg up -q 4 Uses default value of "linear" when value is misspelled - $ echo 'updatecheck = linyar' >> .hg/hgrc + $ echo 'update.check = linyar' >> .hg/hgrc $ revtest 'dirty cross' dirty 3 4 abort: uncommitted changes