diff options
Diffstat (limited to 'tests/test-rebase-abort.t')
| -rw-r--r-- | tests/test-rebase-abort.t | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t index 3be364e..fab0214 100644 --- a/tests/test-rebase-abort.t +++ b/tests/test-rebase-abort.t @@ -3,11 +3,8 @@ > graphlog= > rebase= > - > [phases] - > publish=False - > > [alias] - > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" + > tglog = log -G --template "{rev}: '{desc}' {branches}\n" > EOF @@ -35,18 +32,16 @@ $ mv common.new common $ hg ci -m L2 - $ hg phase --force --secret 2 - $ hg tglog - @ 4:draft 'L2' + @ 4: 'L2' | - o 3:draft 'L1' + o 3: 'L1' | - | o 2:secret 'C3' + | o 2: 'C3' |/ - o 1:draft 'C2' + o 1: 'C2' | - o 0:draft 'C1' + o 0: 'C1' Conflicting rebase: @@ -54,7 +49,7 @@ Conflicting rebase: $ hg rebase -s 3 -d 2 merging common warning: conflicts during merge. - merging common incomplete! (edit conflicts, then use 'hg resolve --mark') + merging common failed! abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] @@ -65,15 +60,15 @@ Abort: rebase aborted $ hg tglog - @ 4:draft 'L2' + @ 4: 'L2' | - o 3:draft 'L1' + o 3: 'L1' | - | o 2:secret 'C3' + | o 2: 'C3' |/ - o 1:draft 'C2' + o 1: 'C2' | - o 0:draft 'C1' + o 0: 'C1' $ cd .. @@ -106,53 +101,48 @@ Constrcut new repo: $ hg ci -Am C1 adding c - $ hg phase --force --secret 1 - $ hg phase --public 1 - Rebase and abort without generating new changesets: $ hg tglog - @ 4:draft 'C1' + @ 4: 'C1' | - o 3:draft 'B bis' + o 3: 'B bis' | - | o 2:secret 'C' + | o 2: 'C' | | - | o 1:public 'B' + | o 1: 'B' |/ - o 0:public 'A' + o 0: 'A' $ hg rebase -b 4 -d 2 merging c warning: conflicts during merge. - merging c incomplete! (edit conflicts, then use 'hg resolve --mark') + merging c failed! abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] $ hg tglog - @ 4:draft 'C1' + @ 4: 'C1' | - o 3:draft 'B bis' + o 3: 'B bis' | - | @ 2:secret 'C' + | @ 2: 'C' | | - | o 1:public 'B' + | o 1: 'B' |/ - o 0:public 'A' + o 0: 'A' $ hg rebase -a rebase aborted $ hg tglog - @ 4:draft 'C1' + @ 4: 'C1' | - o 3:draft 'B bis' + o 3: 'B bis' | - | o 2:secret 'C' + | o 2: 'C' | | - | o 1:public 'B' + | o 1: 'B' |/ - o 0:public 'A' + o 0: 'A' - - $ cd .. |