Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix test-stabilize-conflict.t to match new extra computation in core
authorLaurent Charignon <lcharignon@fb.com>
Fri, 04 Dec 2015 14:00:48 -0800
changeset 1545 13701c3fed9c
parent 1544 3e907ff1981f
child 1546 69a0d60f9c99
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.
tests/test-stabilize-conflict.t file | annotate | diff | comparison | revisions 
--- 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
evolve