Mercurial > evolve

diff tests/test-evolve-phase-divergence.t @ 3629:f23946bf6625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: move logic to complete interrupted orphan resolution to new fn This patch moves logic which completes an interrupted orphan resolution to it's own new function. We will defining such functions for completing phase-divergence and content-divergence too.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 24 Mar 2018 12:58:12 +0530
parents 170b99a9c0b4
children ed3032ee53eb
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t	Fri Mar 23 19:36:08 2018 +0530
+++ b/tests/test-evolve-phase-divergence.t	Sat Mar 24 12:58:12 2018 +0530
@@ -818,20 +818,20 @@
 resolution happening
 
   $ hg evolve --continue
-  evolving 19:5fd38c0de46e "added l to l"
-  working directory is now at 2598cf6ceb65
+  continuing interrupted 'phasedivergent' resolution is not yet supported
+  working directory is now at 8c2bb6fb44e9
 
   $ hg glog
-  @  20:2598cf6ceb65 added l to l
+  *  19:5fd38c0de46e added l to l
   |   () draft
   | o  17:f3794e5a91dc added l to l
-  |/    () public
-  o  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
-  |   () public
-  o  12:dc88f5aa9bc9 y to y and foobar to foo
-  |   () public
-  o  9:2352021b3785 added x to x
-  |   (bm) public
+  | |   () public
+  | @  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+  | |   () public
+  | o  12:dc88f5aa9bc9 y to y and foobar to foo
+  | |   () public
+  | o  9:2352021b3785 added x to x
+  |/    (bm) public
   o  8:502e73736632 phase-divergent update to b756eb10ea73:
   |   () public
   o  6:b756eb10ea73 added bar to bar