Mercurial > evolve

diff tests/test-evolve-abort-contentdiv.t @ 3995:684cc3418ecd mercurial-4.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 13:26:35 +0200
parents d00f0c369bc7 85c99079d41f
children 185770c10a4e a2fdbece7ce1
line wrap: on
line diff
--- a/tests/test-evolve-abort-contentdiv.t	Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Tue Aug 21 13:26:35 2018 +0200
@@ -94,6 +94,22 @@
   # To stop:        hg evolve --stop
   # (also see `hg help evolve.interrupted`)
   
+  $ hg parents
+  changeset:   6:9c1631e352d9
+  tag:         tip
+  parent:      3:ca1b80f7960a
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  instability: content-divergent
+  summary:     added d
+  
+  changeset:   5:e49523854bc8
+  parent:      3:ca1b80f7960a
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  instability: content-divergent
+  summary:     added d
+  
 
   $ hg evolve --abort
   evolve aborted