diff tests/test-evolve-content-divergent-interrupted.t @ 5079:1f92a6aa40d6

evolve: add pre-check logic for content-divergence in rewriteutil.precheck() For now, pre-check will abort if rewriting a rev create divergence (and config experimental.evolution.allowdivergence is not set to True). But this behaviour can be improved where instead of abort maybe we can confirm the user to either proceed with divergence or some other options depends on what command user is running. Changes in test file are used to overrides the pre-check for testing purpose (using experimental.evolution.allowdivergence=yes).
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 04 Nov 2019 01:30:50 +0530
parents 2928f35023a1
children 900668a93629
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t	Wed Jan 01 21:36:21 2020 +0530
+++ b/tests/test-evolve-content-divergent-interrupted.t	Mon Nov 04 01:30:50 2019 +0530
@@ -24,6 +24,8 @@
   > publish = False
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
+  > [experimental]
+  > evolution.allowdivergence = True
   > [extensions]
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH