diff options
Diffstat (limited to 'tests/test-rebase-check-restore.t')
| -rw-r--r-- | tests/test-rebase-check-restore.t | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t index c664725..779e29d 100644 --- a/tests/test-rebase-check-restore.t +++ b/tests/test-rebase-check-restore.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 @@ -39,36 +36,34 @@ $ hg branch 'notdefault' marked working directory as branch notdefault - (branches are permanent and global, did you want a bookmark?) $ echo F >> A $ hg ci -m F $ cd .. -Rebasing B onto E - check keep: and phases +Rebasing B onto E - check keep: $ hg clone -q -u . a a1 $ cd a1 - $ hg phase --force --secret 2 $ hg tglog - @ 5:draft 'F' notdefault + @ 5: 'F' notdefault | - | o 4:draft 'E' + | o 4: 'E' | | - | o 3:draft 'D' + | o 3: 'D' |/ - | o 2:secret 'C' + | o 2: 'C' | | - | o 1:draft 'B' + | o 1: 'B' |/ - o 0:draft 'A' + o 0: 'A' $ hg rebase -s 1 -d 4 --keep merging A warning: conflicts during merge. - merging A incomplete! (edit conflicts, then use 'hg resolve --mark') + merging A failed! abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] @@ -80,21 +75,21 @@ Solve the conflict and go on: $ hg rebase --continue $ hg tglog - @ 7:secret 'C' + @ 7: 'C' | - o 6:draft 'B' + o 6: 'B' | - | o 5:draft 'F' notdefault + | o 5: 'F' notdefault | | - o | 4:draft 'E' + o | 4: 'E' | | - o | 3:draft 'D' + o | 3: 'D' |/ - | o 2:secret 'C' + | o 2: 'C' | | - | o 1:draft 'B' + | o 1: 'B' |/ - o 0:draft 'A' + o 0: 'A' $ cd .. @@ -103,25 +98,24 @@ Rebase F onto E - check keepbranches: $ hg clone -q -u . a a2 $ cd a2 - $ hg phase --force --secret 2 $ hg tglog - @ 5:draft 'F' notdefault + @ 5: 'F' notdefault | - | o 4:draft 'E' + | o 4: 'E' | | - | o 3:draft 'D' + | o 3: 'D' |/ - | o 2:secret 'C' + | o 2: 'C' | | - | o 1:draft 'B' + | o 1: 'B' |/ - o 0:draft 'A' + o 0: 'A' $ hg rebase -s 5 -d 4 --keepbranches merging A warning: conflicts during merge. - merging A incomplete! (edit conflicts, then use 'hg resolve --mark') + merging A failed! abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] @@ -134,17 +128,15 @@ Solve the conflict and go on: saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) $ hg tglog - @ 5:draft 'F' notdefault + @ 5: 'F' notdefault | - o 4:draft 'E' + o 4: 'E' | - o 3:draft 'D' + o 3: 'D' | - | o 2:secret 'C' + | o 2: 'C' | | - | o 1:draft 'B' + | o 1: 'B' |/ - o 0:draft 'A' + o 0: 'A' - - $ cd .. |