Mercurial > hg > evolve
changeset 1640:3e907ff1981f
evolve: fix test-sharing.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-sharing.t
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Fri, 04 Dec 2015 14:01:28 -0800 |
parents | 54394d2aaf5e |
children | 13701c3fed9c |
files | tests/test-sharing.t |
diffstat | 1 files changed, 25 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-sharing.t +++ b/tests/test-sharing.t @@ -387,7 +387,7 @@ Figure SG08: review and public changesets after Alice pushes. $ hg --hidden -R ../review shortlog -G -r 1:: - o 7:a06ec1bf97bd public fix bug 15 (v2) + o 7:754cbfea9b13 public fix bug 15 (v2) | o 6:540ba8f317e6 public implement feature X (v3) | @@ -402,7 +402,7 @@ @ 1:de6151c48e1c public fix bug 37 | $ hg --hidden -R ../public shortlog -G -r 1:: - o 3:a06ec1bf97bd public fix bug 15 (v2) + o 3:754cbfea9b13 public fix bug 15 (v2) | o 2:540ba8f317e6 public implement feature X (v3) | @@ -431,7 +431,7 @@ $ echo 'pretty good fix' >> file1 $ hg commit -u bob -m 'fix bug 24 (v1)' $ hg shortlog -r . - 4:2fe6c4bd32d0 draft fix bug 24 (v1) + 4:6d407e4bc7f4 draft fix bug 24 (v1) Since Alice and Bob are now in cowboy mode, Alice pulls Bob's draft changeset and amends it herself. :: @@ -454,13 +454,13 @@ $ echo 'better fix (bob)' >> file1 $ hg amend -u bob -m 'fix bug 24 (v2 by bob)' $ hg --hidden shortlog -G -r 3:: - @ 6:a360947f6faf draft fix bug 24 (v2 by bob) + @ 6:059a6be5b63a draft fix bug 24 (v2 by bob) | - | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0 + | x 5:a2493482aafe draft temporary amend commit for 6d407e4bc7f4 | | - | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) + | x 4:6d407e4bc7f4 draft fix bug 24 (v1) |/ - o 3:a06ec1bf97bd public fix bug 15 (v2) + o 3:754cbfea9b13 public fix bug 15 (v2) | Bob discovers the divergence. @@ -477,19 +477,19 @@ Figure SG09: multiple heads! divergence! oh my! $ hg --hidden shortlog -G -r 3:: - o 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) + o 7:cdcc922d8d15 draft fix bug 24 (v2 by alice) | - | @ 6:a360947f6faf draft fix bug 24 (v2 by bob) + | @ 6:059a6be5b63a draft fix bug 24 (v2 by bob) |/ - | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0 + | x 5:a2493482aafe draft temporary amend commit for 6d407e4bc7f4 | | - | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) + | x 4:6d407e4bc7f4 draft fix bug 24 (v1) |/ - o 3:a06ec1bf97bd public fix bug 15 (v2) + o 3:754cbfea9b13 public fix bug 15 (v2) | - $ hg --hidden shortlog -r 'successors(2fe6)' - 6:a360947f6faf draft fix bug 24 (v2 by bob) - 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) + $ hg --hidden shortlog -r 'successors(6d407)' + 6:059a6be5b63a draft fix bug 24 (v2 by bob) + 7:cdcc922d8d15 draft fix bug 24 (v2 by alice) Use evolve to fix the divergence. $ HGMERGE=internal:other hg evolve --divergent @@ -497,28 +497,28 @@ with: [7] fix bug 24 (v2 by alice) base: [4] fix bug 24 (v1) 0 files updated, 1 files merged, 0 files removed, 0 files unresolved - working directory is now at 5ad6037c046c + working directory is now at 70e807c6e67f $ hg log -q -r 'divergent()' Figure SG10: Bob's repository after fixing divergence. $ hg --hidden shortlog -G -r 3:: - @ 9:5ad6037c046c draft fix bug 24 (v2 by bob) + @ 9:70e807c6e67f draft fix bug 24 (v2 by bob) | - | x 8:bcfc9a755ac3 draft temporary amend commit for a360947f6faf + | x 8:d8d2e15ab73d draft temporary amend commit for 059a6be5b63a | | - +---x 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) + +---x 7:cdcc922d8d15 draft fix bug 24 (v2 by alice) | | - | x 6:a360947f6faf draft fix bug 24 (v2 by bob) + | x 6:059a6be5b63a draft fix bug 24 (v2 by bob) |/ - | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0 + | x 5:a2493482aafe draft temporary amend commit for 6d407e4bc7f4 | | - | x 4:2fe6c4bd32d0 draft fix bug 24 (v1) + | x 4:6d407e4bc7f4 draft fix bug 24 (v1) |/ - o 3:a06ec1bf97bd public fix bug 15 (v2) + o 3:754cbfea9b13 public fix bug 15 (v2) | $ hg --hidden shortlog -r 'precursors(9)' - 6:a360947f6faf draft fix bug 24 (v2 by bob) - 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) + 6:059a6be5b63a draft fix bug 24 (v2 by bob) + 7:cdcc922d8d15 draft fix bug 24 (v2 by alice) $ cat file1 Do stuff. pretty good fix