Mercurial > evolve
changeset 1545:13701c3fed9c
evolve: fix test-stabilize-conflict.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-stabilize-conflict.t.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Fri, 04 Dec 2015 14:00:48 -0800 |
| parents | 3e907ff1981f |
| children | 69a0d60f9c99 |
| files | tests/test-stabilize-conflict.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t Fri Dec 04 14:01:28 2015 -0800 +++ b/tests/test-stabilize-conflict.t Fri Dec 04 14:00:48 2015 -0800 @@ -169,7 +169,7 @@ grafting 5:71c18f70c34f "babar count up to fifteen" $ hg resolve -l $ hg log -G - @ changeset: 8:1836b91c6c1d + @ changeset: 8:7f3d9db50b5d | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -232,7 +232,7 @@ | date: Thu Jan 01 00:00:00 1970 +0000 | summary: babar count up to ten | - | o changeset: 8:1836b91c6c1d + | o changeset: 8:7f3d9db50b5d | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: babar count up to fifteen