Mercurial > evolve

changeset 6103:f138aea6e26b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test cases resolution documentation to current status
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 03 Sep 2021 23:16:43 +0530
parents 01bc197f31d3
children 61b64cd8d869
files tests/test-evolve-wdir.t
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-wdir.t	Fri Sep 03 23:13:13 2021 +0530
+++ b/tests/test-evolve-wdir.t	Fri Sep 03 23:16:43 2021 +0530
@@ -17,10 +17,12 @@
 ..     Resolution : update to a not-dead ancestor
 ..
 .. Case C: obsolete wdp with multiple successor (divergence rewriting)
-..     Resolution : #TODO: not handled yet
+..     Resolution : suggest to check out one of the divergent cset and
+..                  run `hg evolve --content-divergent`
 ..
 .. Case D: obsolete wdp with multiple successor (split rewriting)
-..     Resolution : #TODO: not handled yet
+..     Resolution : if split over a single topological branch, update to
+..                  tipmost, otherwise ask user to choose one
 
 A. Obsolete wdp with single successor
 -------------------------------------