Mercurial > evolve

changeset 6075:f49e5fa3ae0e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add a help section for 'skip content-divergence check'
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 23 Jul 2021 13:08:56 +0530
parents 99153a05e1f5
children 0d8d805fadbb
files hgext3rd/evolve/__init__.py tests/test-evolve.t
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py	Fri Oct 15 11:36:03 2021 +0300
+++ b/hgext3rd/evolve/__init__.py	Fri Jul 23 13:08:56 2021 +0530
@@ -273,6 +273,14 @@
 
     [experimental]
     evolution=all
+
+To prevent users from creating content divergence, a check is performed by
+default on the revisions being rewritten, and the operation is aborted if it
+creates divergence. If users want to allow creating content divergent
+changesets, this check can be turned off by setting the following config::
+
+    [experimental]
+    evolution.allowdivergence=True
 """
 
 import sys
--- a/tests/test-evolve.t	Fri Oct 15 11:36:03 2021 +0300
+++ b/tests/test-evolve.t	Fri Jul 23 13:08:56 2021 +0530
@@ -113,6 +113,14 @@
   
         [experimental]
         evolution=all
+  
+      To prevent users from creating content divergence, a check is performed by
+      default on the revisions being rewritten, and the operation is aborted if
+      it creates divergence. If users want to allow creating content divergent
+      changesets, this check can be turned off by setting the following config:
+  
+        [experimental]
+        evolution.allowdivergence=True
 
 various init