Patchwork [1,of,2] rebase: add test for in-memory merge conflicts

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 17, 2018, 1:34 a.m.
Message ID <e338a921a0cdc60717e5.1534469642@mimosa>
Download mbox | patch
Permalink /patch/33808/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 17, 2018, 1:34 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1534468757 -32400
#      Fri Aug 17 10:19:17 2018 +0900
# Node ID e338a921a0cdc60717e5aebc7dc4bb9ba203478d
# Parent  06baaf43c9599534ffe3b6ecd3275e68abe68c34
rebase: add test for in-memory merge conflicts
Pulkit Goyal - Aug. 17, 2018, 11:37 a.m.
On Fri, Aug 17, 2018 at 4:34 AM Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1534468757 -32400
> #      Fri Aug 17 10:19:17 2018 +0900
> # Node ID e338a921a0cdc60717e5aebc7dc4bb9ba203478d
> # Parent  06baaf43c9599534ffe3b6ecd3275e68abe68c34
> rebase: add test for in-memory merge conflicts
>

Queued this series, many thanks!

Patch

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -351,6 +351,19 @@  Check dryrun working with --collapse whe
   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|
 ==========================