Mercurial > hg-stable

changeset 39171:e338a921a0cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add test for in-memory merge conflicts
author Yuya Nishihara <yuya@tcha.org>
date Fri, 17 Aug 2018 10:19:17 +0900
parents 06baaf43c959
children 485a3349d5ee
files tests/test-rebase-inmemory.t
diffstat 1 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t	Thu Aug 16 18:53:51 2018 +0000
+++ b/tests/test-rebase-inmemory.t	Fri Aug 17 10:19:17 2018 +0900
@@ -351,6 +351,19 @@
   hit a merge conflict
   [1]
 
+In-memory rebase that fails due to merge conflicts
+
+  $ hg rebase -s 2 -d 7
+  rebasing 2:177f92b77385 "c"
+  rebasing 3:055a42cdd887 "d"
+  rebasing 4:e860deea161a "e"
+  merging e
+  transaction abort!
+  rollback completed
+  hit merge conflicts; re-running rebase without in-memory merge
+  abort: abort and continue do not allow specifying revisions
+  [255]
+
 ==========================
 Test for --confirm option|
 ==========================