Mercurial > hg
diff tests/test-rebase-obsolete.t @ 35518:02fdb8c018aa
update: support updating to hidden cset if directaccess config is set
This patch adds support for updating to a hidden changeset without using
--hidden if `experimental.directacces=True` is set. The update command will
print out a warning when updating to a hidden changeset saying:
`updating to a hidden changeset <hash>`
The warning is also printed when directaccess is not used and --hidden is
passed which I think is good behaviour. Tests are added for the directaccess
part and updated output of tests which have case of updating to hidden cset
using `--hidden`.
Differential Revision: https://phab.mercurial-scm.org/D1762
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 27 Dec 2017 00:14:00 +0530 |
parents | 9b3f95d9783d |
children | 7336ac5e786e |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Tue Dec 26 22:54:45 2017 +0530 +++ b/tests/test-rebase-obsolete.t Wed Dec 27 00:14:00 2017 +0530 @@ -280,6 +280,7 @@ even though it is hidden (until we're moved there). $ hg --hidden up -qr 'first(hidden())' + updating to a hidden changeset 42ccdea3bb16 $ hg rebase --rev 13 --dest 15 rebasing 13:98f6af4ee953 "C" $ hg log -G @@ -610,6 +611,7 @@ Test hidden changesets in the rebase set (issue4504) $ hg up --hidden 9 + updating to a hidden changeset 4bde274eefcf 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo J > J $ hg add J @@ -725,6 +727,7 @@ $ hg commit --amend -m B1 $ hg commit --amend -m B2 $ hg up --hidden 'desc(B0)' + updating to a hidden changeset a8b11f55fb19 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo C > C $ hg add C @@ -748,6 +751,7 @@ Even when the chain include missing node $ hg up --hidden 'desc(B0)' + updating to a hidden changeset a8b11f55fb19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo D > D $ hg add D @@ -862,6 +866,7 @@ $ hg add bar $ hg commit --amend -m "10'" $ hg up 10 --hidden + updating to a hidden changeset 121d9e3bc4c6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo "bar" > foo $ hg add foo @@ -1595,6 +1600,7 @@ $ rm .hg/localtags $ hg update -q $C --hidden + updating to a hidden changeset 7829726be4dc $ hg rebase -s $B -d $D rebasing 1:2ec65233581b "B" merging D