Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-obsolete.t
changeset 35995 b7e2cf114e85
parent 35993 a603a570cdbe
child 37787 92213f6745ed 
--- a/tests/test-rebase-obsolete.t	Fri Feb 09 21:45:16 2018 +0100
+++ b/tests/test-rebase-obsolete.t	Fri Feb 09 22:49:20 2018 +0100
@@ -1244,10 +1244,6 @@
   o  0:b173517d0057 a
   
   $ hg rebase -d 0 -r 2
-  abort: this rebase will cause divergences from: a82ac2b38757
-  (to force the rebase please set experimental.evolution.allowdivergence=True)
-  [255]
-  $ hg rebase -d 0 -r 2 --config experimental.evolution.allowdivergence=True
   rebasing 2:a82ac2b38757 "c" (c)
   $ hg log -G -r 'a': --hidden
   o  5:69ad416a4a26 c
mercurial