Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 1595:edcd2f0474c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: back hash change from 'extra' content change out The changesets 13701c3fed9c, 3e907ff1981f and 54394d2aaf5e were introduced to handle a change to the way extra were carried out by various command in core. This had to be backout for 3.7.1 as is broken multiple third party extension. We backout the test update as a result. Core changesets performing the backout: ce9696193175::b698abf971e7
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 03 Feb 2016 23:21:50 +0000
parents 13701c3fed9c
children 9fd15f27c91c
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Fri Jan 22 21:41:59 2016 +0900
+++ b/tests/test-stabilize-conflict.t	Wed Feb 03 23:21:50 2016 +0000
@@ -169,7 +169,7 @@
   grafting 5:71c18f70c34f "babar count up to fifteen"
   $ hg resolve -l
   $ hg log -G
-  @  changeset:   8:7f3d9db50b5d
+  @  changeset:   8:1836b91c6c1d
   |  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:7f3d9db50b5d
+  | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen