Mercurial > hg

diff tests/test-rebase-obsolete.t @ 28188:6411140aeda9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add potential divergent commit hashes to error message (issue5086)
author Kostia Balytskyi <ikostia@fb.com>
date Wed, 17 Feb 2016 20:31:34 +0000
parents bb14a81ce647
children dc6032a1d888
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t	Fri Feb 19 17:50:28 2016 +0100
+++ b/tests/test-rebase-obsolete.t	Wed Feb 17 20:31:34 2016 +0000
@@ -771,7 +771,7 @@
   phases: 8 draft
   unstable: 1 changesets
   $ hg rebase -s 10 -d 12
-  abort: this rebase will cause divergence
+  abort: this rebase will cause divergences from: 121d9e3bc4c6
   (to force the rebase please set rebase.allowdivergence=True)
   [255]
   $ hg log -G