diff tests/test-branch-change.t @ 47061: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

--- a/tests/test-branch-change.t	Wed Apr 28 08:48:10 2021 -0700
+++ b/tests/test-branch-change.t	Tue Feb 23 10:28:42 2021 -0800
@@ -150,7 +150,8 @@
   [255]
 
   $ hg branch -r 4 --hidden foobar
-  abort: cannot change branch of a obsolete changeset
+  abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886
+  (add --verbose for details)
   [10]
 
 Make sure bookmark movement is correct