[PATCH 3 of 4 evolve-ext] evolve: fix test-stabilize-conflict.t to match new extra computation in core

Laurent Charignon lcharignon at fb.com
Fri Dec 4 16:03:45 CST 2015


# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1449266448 28800
#      Fri Dec 04 14:00:48 2015 -0800
# Node ID 44290b46fe3d7b1d8bd4667f577524126dcbff4e
# Parent  bc829ad5ffd4898d8c51ae386c12587c4f11f2b3
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.

diff --git a/tests/test-stabilize-conflict.t b/tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -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


More information about the Mercurial-devel mailing list