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.
tests: demonstrate the interrupted evolve does not set p2 stable
authorPulkit Goyal <pulkit@yandex-team.ru>
Sat, 18 Aug 2018 20:24:41 +0530
branchstable
changeset 3976 d081528bb372
parent 3966 ea7687a9a4b8
child 3977 a0a4f4de9ea3
tests: demonstrate the interrupted evolve does not set p2 This patch adds a test to demonstrate issue5927 which is about evolving not setting p2 correctly in interruption.
tests/test-evolve-abort-contentdiv.t file | annotate | diff | comparison | revisions
tests/test-evolve-abort-orphan.t file | annotate | diff | comparison | revisions
tests/test-evolve-abort-phasediv.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve-abort-contentdiv.t	Fri Aug 17 16:26:44 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Sat Aug 18 20:24:41 2018 +0530
@@ -96,6 +96,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
--- a/tests/test-evolve-abort-orphan.t	Fri Aug 17 16:26:44 2018 +0200
+++ b/tests/test-evolve-abort-orphan.t	Sat Aug 18 20:24:41 2018 +0530
@@ -88,6 +88,15 @@
   fix conflicts and see `hg help evolve.interrupted`
   [1]
 
+  $ hg parents
+  changeset:   5:e93a9161a274
+  tag:         tip
+  parent:      2:b1661037fa25
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     added c
+  
+
   $ hg evolve --abort
   evolve aborted
   working directory is now at e93a9161a274
--- a/tests/test-evolve-abort-phasediv.t	Fri Aug 17 16:26:44 2018 +0200
+++ b/tests/test-evolve-abort-phasediv.t	Sat Aug 18 20:24:41 2018 +0530
@@ -108,6 +108,13 @@
   # (also see `hg help evolve.interrupted`)
   
 
+  $ hg parents
+  changeset:   3:ca1b80f7960a
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     added c
+  
+
   $ hg evolve --abort
   evolve aborted
   working directory is now at ddba58020bc0
evolve