Mercurial > evolve
changeset 1543:54394d2aaf5e
evolve: fix test-tutorial.t to match new extra computation in core
Recent patches changed the way we compute extras for rebase and graft. This
changes the hashes in evolve's tests. This patch fixes the test
test-tutorial.t
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Fri, 04 Dec 2015 14:01:36 -0800 |
| parents | 333e056b3034 |
| children | 3e907ff1981f |
| files | tests/test-tutorial.t |
| diffstat | 1 files changed, 67 insertions(+), 67 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-tutorial.t Mon Nov 30 16:48:40 2015 -0800 +++ b/tests/test-tutorial.t Fri Dec 04 14:01:36 2015 -0800 @@ -251,7 +251,7 @@ My local work is now rebased on the remote one. $ hg log -G - @ 41aff6a42b75 (draft): adding fruit + @ f49d36e87e8a (draft): adding fruit | o dfd3a2d7691e (draft): adding condiment | @@ -273,9 +273,9 @@ > EOF $ hg ci -m 'transport' $ hg log -G - @ 1125e39fbf21 (draft): transport + @ 207804be803b (draft): transport | - o 41aff6a42b75 (draft): adding fruit + o f49d36e87e8a (draft): adding fruit | o dfd3a2d7691e (draft): adding condiment | @@ -289,13 +289,13 @@ $ hg prune . # "." is for working directory parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at 41aff6a42b75 + working directory now at f49d36e87e8a 1 changesets pruned The silly changeset is gone. $ hg log -G - @ 41aff6a42b75 (draft): adding fruit + @ f49d36e87e8a (draft): adding fruit | o dfd3a2d7691e (draft): adding condiment | @@ -323,11 +323,11 @@ $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping $ hg ci -m 'SPAM SPAM' $ hg log -G - @ fac207dec9f5 (draft): SPAM SPAM + @ 0a0104b5de2f (draft): SPAM SPAM | - o 10b8aeaa8cc8 (draft): bathroom stuff + o 0dbf8779b56f (draft): bathroom stuff | - o 41aff6a42b75 (draft): adding fruit + o f49d36e87e8a (draft): adding fruit | o dfd3a2d7691e (draft): adding condiment | @@ -346,18 +346,18 @@ .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` - $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent + $ hg up 'p1(0dbf8779b56f)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent - rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) + $ hg grab 0a0104b5de2f # moving "SPAM SPAM" to the working directory parent + rebasing 10:0a0104b5de2f "SPAM SPAM" (tip) merging shopping ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G - @ a224f2a4fb9f (draft): SPAM SPAM + @ 21ddb8bb7ace (draft): SPAM SPAM | - | o 10b8aeaa8cc8 (draft): bathroom stuff + | o 0dbf8779b56f (draft): bathroom stuff |/ - o 41aff6a42b75 (draft): adding fruit + o f49d36e87e8a (draft): adding fruit | o dfd3a2d7691e (draft): adding condiment | @@ -377,8 +377,8 @@ # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 - # Node ID a224f2a4fb9f9f828f608959912229d7b38b26de - # Parent 41aff6a42b7578ec7ec3cb2041633f1ca43cca96 + # Node ID 21ddb8bb7acea9d1c46bf8a3965590c595aecb99 + # Parent f49d36e87e8ac78cba19b4aa94421cf13c18bcb5 SPAM SPAM diff --git a/shopping b/shopping @@ -394,7 +394,7 @@ To make sure I do not push unready changeset by mistake I set the "bathroom stuff" changeset in the secret phase. - $ hg phase --force --secret 10b8aeaa8cc8 + $ hg phase --force --secret 0dbf8779b56f we can now push our change: @@ -409,17 +409,17 @@ for simplicity sake we get the bathroom change in line again - $ hg grab 10b8aeaa8cc8 - rebasing 9:10b8aeaa8cc8 "bathroom stuff" + $ hg grab 0dbf8779b56f + rebasing 9:0dbf8779b56f "bathroom stuff" merging shopping ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg phase --draft . $ hg log -G - @ 75954b8cd933 (draft): bathroom stuff + @ 1820dfc355a0 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -528,11 +528,11 @@ 1 new obsolescence markers (run 'hg update' to get a working copy) $ hg log -G - o 75954b8cd933 (public): bathroom stuff + o 1820dfc355a0 (public): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -550,9 +550,9 @@ $ hg rollback repository tip rolled back to revision 4 (undo pull) $ hg log -G - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -585,11 +585,11 @@ 1 new obsolescence markers (run 'hg update' to get a working copy) $ hg log -G - o 75954b8cd933 (draft): bathroom stuff + o 1820dfc355a0 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -603,7 +603,7 @@ Remotely someone add a new changeset on top of the mutable "bathroom" on. - $ hg up 75954b8cd933 -q + $ hg up 1820dfc355a0 -q $ cat >> shopping << EOF > Giraffe > Rhino @@ -615,15 +615,15 @@ But at the same time, locally, this same "bathroom changeset" was updated. $ cd ../local - $ hg up 75954b8cd933 -q + $ hg up 1820dfc355a0 -q $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping $ hg commit --amend $ hg log -G - @ a44c85f957d3 (draft): bathroom stuff + @ adef71cd3160 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -650,15 +650,15 @@ see both version showing up in the log. $ hg log -G - o bf1b0d202029 (draft): animals + o f9d416ff3ea5 (draft): animals | - | @ a44c85f957d3 (draft): bathroom stuff + | @ adef71cd3160 (draft): bathroom stuff | | - x | 75954b8cd933 (draft): bathroom stuff + x | 1820dfc355a0 (draft): bathroom stuff |/ - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -678,7 +678,7 @@ $ hg push other pushing to $TESTTMP/other (glob) searching for changes - abort: push includes unstable changeset: bf1b0d202029! + abort: push includes unstable changeset: f9d416ff3ea5! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] @@ -693,7 +693,7 @@ $ hg evolve --dry-run move:[15] animals atop:[14] bathroom stuff - hg rebase -r bf1b0d202029 -d a44c85f957d3 + hg rebase -r f9d416ff3ea5 -d adef71cd3160 Let's do it @@ -701,18 +701,18 @@ move:[15] animals atop:[14] bathroom stuff merging shopping - working directory is now at ee942144f952 + working directory is now at 0325a6c93ec2 The old version of bathroom is hidden again. $ hg log -G - @ ee942144f952 (draft): animals + @ 0325a6c93ec2 (draft): animals | - o a44c85f957d3 (draft): bathroom stuff + o adef71cd3160 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -746,13 +746,13 @@ now let's see where we are, and update to the successor $ hg parents - bf1b0d202029 (draft): animals + f9d416ff3ea5 (draft): animals working directory parent is obsolete! (use "hg evolve" to update to its successor) $ hg evolve update:[8] animals 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at ee942144f952 + working directory is now at 0325a6c93ec2 Relocating unstable change after prune ---------------------------------------------- @@ -774,15 +774,15 @@ added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) $ hg log -G - o 99f039c5ec9e (draft): SPAM SPAM SPAM + o e8373c1af7dc (draft): SPAM SPAM SPAM | - @ ee942144f952 (draft): animals + @ 0325a6c93ec2 (draft): animals | - o a44c85f957d3 (draft): bathroom stuff + o adef71cd3160 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -793,9 +793,9 @@ In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: - $ hg prune ee942144f952 + $ hg prune 0325a6c93ec2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory now at a44c85f957d3 + working directory now at adef71cd3160 1 changesets pruned 1 new unstable changesets @@ -804,15 +804,15 @@ is neither dead or obsolete. My repository is in an unstable state again. $ hg log -G - o 99f039c5ec9e (draft): SPAM SPAM SPAM + o e8373c1af7dc (draft): SPAM SPAM SPAM | - x ee942144f952 (draft): animals + x 0325a6c93ec2 (draft): animals | - @ a44c85f957d3 (draft): bathroom stuff + @ adef71cd3160 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment | @@ -822,22 +822,22 @@ $ hg log -r 'unstable()' - 99f039c5ec9e (draft): SPAM SPAM SPAM + e8373c1af7dc (draft): SPAM SPAM SPAM $ hg evolve move:[17] SPAM SPAM SPAM atop:[14] bathroom stuff merging shopping - working directory is now at 40aa40daeefb + working directory is now at 5b9223df71d2 $ hg log -G - @ 40aa40daeefb (draft): SPAM SPAM SPAM + @ 5b9223df71d2 (draft): SPAM SPAM SPAM | - o a44c85f957d3 (draft): bathroom stuff + o adef71cd3160 (draft): bathroom stuff | - o a224f2a4fb9f (public): SPAM SPAM + o 21ddb8bb7ace (public): SPAM SPAM | - o 41aff6a42b75 (public): adding fruit + o f49d36e87e8a (public): adding fruit | o dfd3a2d7691e (public): adding condiment |