diff tests/test-fix.t @ 48672:657e490756e6

fix: remove unnecessary and overly strict check for divergence `rewriteutil.precheck()` checks for divergence these days, so we can remove the redundant check in `hg fix`. Differential Revision: https://phab.mercurial-scm.org/D12088
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 11 Feb 2021 22:52:43 -0800
parents e6aecc37bfbf
children b5ecd0bcbcd7
line wrap: on
line diff
--- a/tests/test-fix.t	Wed Jan 26 10:11:01 2022 -0800
+++ b/tests/test-fix.t	Thu Feb 11 22:52:43 2021 -0800
@@ -1169,8 +1169,9 @@
   $ hg commit -Aqm "foo"
   $ hg ci --amend -m rewritten
   $ hg --hidden fix -r 0
-  abort: fixing obsolete revision could cause divergence
-  [255]
+  abort: cannot fix b87e30dbf19b, as that creates content-divergence with 2e007a78dfb8
+  (add --verbose for details or see 'hg help evolution.instability')
+  [10]
 
   $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
   2 new content-divergent changesets