Mercurial > evolve

diff tests/test-stabilize-result.t @ 1750:1dbb8fdb725a mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge future 5.5 There is a small limitation of split that does not clean up its working directory on failure otherwise all is fine.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 28 Oct 2016 16:59:32 +0200
parents dd6f090b7342 343298df3f26
children bc590681de77 ad04f3c3b1a9
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Fri May 06 00:24:00 2016 +0200
+++ b/tests/test-stabilize-result.t	Fri Oct 28 16:59:32 2016 +0200
@@ -177,10 +177,10 @@
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
   computing new diff
-  committed as (a7cabd7bd9c2|671b9d7eeaec) (re)
-  working directory is now at (a7cabd7bd9c2|671b9d7eeaec) (re)
+  committed as c2c1151aa854
+  working directory is now at c2c1151aa854
   $ glog
-  @  14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
+  @  14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363:
   |
   | o  9:7bc2f5967f5e@default(draft) bk:[] add c
   | |