diff options
Diffstat (limited to 'tests/test-rebase-interruptions.t')
| -rw-r--r-- | tests/test-rebase-interruptions.t | 114 |
1 files changed, 20 insertions, 94 deletions
diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t index 28fd76e..15251be 100644 --- a/tests/test-rebase-interruptions.t +++ b/tests/test-rebase-interruptions.t @@ -3,12 +3,8 @@ > graphlog= > rebase= > - > [phases] - > publish=False - > > [alias] > tglog = log -G --template "{rev}: '{desc}' {branches}\n" - > tglogp = log -G --template "{rev}:{phase} '{desc}' {branches}\n" > EOF @@ -60,7 +56,7 @@ Rebasing B onto E: $ hg rebase -s 1 -d 4 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] @@ -72,31 +68,27 @@ Force a commit on C during the interruption: $ hg add Extra $ hg ci -m 'Extra' -Force this commit onto secret phase - - $ hg phase --force --secret 6 - - $ hg tglogp - @ 6:secret 'Extra' + $ hg tglog + @ 6: 'Extra' | - | o 5:draft 'B' + | o 5: 'B' | | - | o 4:draft 'E' + | o 4: 'E' | | - | o 3:draft 'D' + | o 3: 'D' | | - o | 2:draft 'C' + o | 2: 'C' | | - o | 1:draft 'B' + o | 1: 'B' |/ - o 0:draft 'A' + o 0: 'A' Resume the rebasing: $ hg rebase --continue 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] @@ -109,22 +101,22 @@ Solve the conflict and go on: $ hg rebase --continue warning: new changesets detected on source branch, not stripping - $ hg tglogp - @ 7:draft 'C' + $ hg tglog + @ 7: 'C' | - | o 6:secret 'Extra' + | o 6: 'Extra' | | - o | 5:draft 'B' + o | 5: 'B' | | - o | 4:draft 'E' + o | 4: 'E' | | - o | 3:draft 'D' + o | 3: 'D' | | - | o 2:draft 'C' + | o 2: 'C' | | - | o 1:draft 'B' + | o 1: 'B' |/ - o 0:draft 'A' + o 0: 'A' $ cd .. @@ -150,7 +142,7 @@ Rebasing B onto E: $ hg rebase -s 1 -d 4 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] @@ -200,69 +192,3 @@ Abort the rebasing: $ cd .. -Changes during an interruption - abort (again): - - $ hg clone -q -u . a a3 - $ cd a3 - - $ hg tglogp - @ 4:draft 'E' - | - o 3:draft 'D' - | - | o 2:draft 'C' - | | - | o 1:draft 'B' - |/ - o 0:draft 'A' - -Rebasing B onto E: - - $ hg rebase -s 1 -d 4 - merging A - warning: conflicts during merge. - merging A incomplete! (edit conflicts, then use 'hg resolve --mark') - abort: unresolved conflicts (see hg resolve, then hg rebase --continue) - [255] - -Change phase on B and B' - - $ hg up -q -C 5 - $ hg phase --public 1 - $ hg phase --public 5 - $ hg phase --secret -f 2 - - $ hg tglogp - @ 5:public 'B' - | - o 4:public 'E' - | - o 3:public 'D' - | - | o 2:secret 'C' - | | - | o 1:public 'B' - |/ - o 0:public 'A' - -Abort the rebasing: - - $ hg rebase --abort - abort: can't abort rebase due to immutable changesets 45396c49d53b - (see hg help phases for details) - [255] - - $ hg tglogp - @ 5:public 'B' - | - o 4:public 'E' - | - o 3:public 'D' - | - | o 2:secret 'C' - | | - | o 1:public 'B' - |/ - o 0:public 'A' - - $ cd .. |