facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-07 14:10:42 +03:00
Code Issues Projects Releases Wiki Activity

tests: update tests with bookmarks behavior change

Browse Source 
Summary:
Update tests. They are caused by the use of deprecated command "rollback".
Normally this kind of issues shouldn't happen.

Reviewed By: DurhamG

Differential Revision: D21164084

fbshipit-source-id: 7d847166f999e2bc472bb8276c1ebb66ad7c45c2
This commit is contained in:
Jun Wu 2020-04-21 14:30:09 -07:00 committed by Facebook GitHub Bot
parent 5ed9871d31
commit b72002f91d
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eden/scm/tests/test-bookmarks.t
View File

@ -518,6 +518,7 @@ test rollback
repository tip rolled back to revision 2 (undo commit)
working directory now based on revision 2
$ hg bookmarks
unknown reference in .hg/bookmarks: tmp-rollback 2bf5cfec5864a07e71c9d3a2a96f5c9766595ba1
X2 1:925d80f479bb
Y 2:db815d6d32e6
Z 2:db815d6d32e6
@ -526,6 +527,7 @@ test rollback
activate bookmark on working dir parent without --force
$ hg bookmark --inactive Z
unknown reference in .hg/bookmarks: tmp-rollback 2bf5cfec5864a07e71c9d3a2a96f5c9766595ba1
$ hg bookmark Z
test clone

4
eden/scm/tests/test-pull-update-t.py
View File

@ -128,7 +128,7 @@ sh % "hg rollback -q"
# (2) activating by URL#BOOKMARK
sh % "hg bookmark -f active-before-pull"
sh % "hg bookmark -f active-before-pull" == "unknown reference in .hg/bookmarks: active-after-pull f815b3da61635081d9570544593e2ad30a0d9655"
sh % "hg bookmarks" == " * active-before-pull 3:483b76ad4309"
sh % "hg pull -u '$TESTTMP/t#active-after-pull'" == r"""
@ -163,7 +163,7 @@ sh % "cd ../tt"
# (1) deactivating by --rev REV
sh % "hg bookmark -f active-before-pull"
sh % "hg bookmark -f active-before-pull" == "unknown reference in .hg/bookmarks: active-after-pull f815b3da61635081d9570544593e2ad30a0d9655"
sh % "hg bookmarks" == " * active-before-pull 3:483b76ad4309"
sh % "hg pull -u -r f815b3da6163" == r"""

3
eden/scm/tests/test-url-rev.t
View File

@ -129,9 +129,11 @@ Changing original repo:
repository tip rolled back to revision 1 (undo push)
$ hg -q incoming
unknown reference in .hg/bookmarks: foo 7d4251d04d20dbc31ba80930dc39d0db4550506b
2:7d4251d04d20
$ hg -q pull
unknown reference in .hg/bookmarks: foo 7d4251d04d20dbc31ba80930dc39d0db4550506b
$ hg heads
changeset: 2:7d4251d04d20
@ -227,6 +229,7 @@ Test handling common incoming revisions between "default" and
$ echo modified >> bar
$ hg commit -m "new head to push current default head"
$ hg -q push -r ".^1" '../clone'
unknown reference in .hg/bookmarks: foo 7d4251d04d20dbc31ba80930dc39d0db4550506b
$ hg -q outgoing '../clone'
4:44b4e0c07491