diff tests/test-obshistory.t @ 47020:ba6881c6a178

rewriteutil: check for divergence This code is adapted from the code in the evolve extension. It seems to be equivalent as far as the evolve extension's test suite can tell (the only impact when making their `precheck()` delegate to our version is that error messages are less detailed). I had to change the error message to work with "change branch of" being inserted as the action. Differential Revision: https://phab.mercurial-scm.org/D10518
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 23 Feb 2021 10:28:42 -0800
parents 95c4cca641f6
children 5105a9975407
line wrap: on
line diff
--- a/tests/test-obshistory.t	Wed Apr 28 08:48:10 2021 -0700
+++ b/tests/test-obshistory.t	Tue Feb 23 10:28:42 2021 -0800
@@ -13,6 +13,7 @@
   > [experimental]
   > evolution.createmarkers = yes
   > evolution.effect-flags = yes
+  > evolution.allowdivergence=true
   > EOF
 
 Test output on amended commit