tests/test-amend.t
changeset 47381 8125bcd28a5c
parent 47282 055f7b9f2307
child 47552 93ca7d3278b9
--- a/tests/test-amend.t	Tue May 25 09:20:30 2021 +0200
+++ b/tests/test-amend.t	Tue Jun 01 22:38:29 2021 -0700
@@ -241,6 +241,13 @@
   abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
   (add --verbose for details or see 'hg help evolution.instability')
   [10]
+  $ hg amend -m divergent --verbose
+  abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
+      changeset 112478962961 already has a successor in changeset 16084da537dd
+      rewriting changeset 112478962961 would create "content-divergence"
+      set experimental.evolution.allowdivergence=True to skip this check
+  (see 'hg help evolution.instability' for details on content-divergence)
+  [10]
   $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
   2 new content-divergent changesets
 #endif