Mercurial > hg

comparison tests/test-rebase-interruptions.t @ 15501:2371f4aea665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: give a special message for internal:merge failure (issue3105)
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Nov 2011 18:04:19 -0600
parents b19b4c1df066
children 65df60a3f96b
comparison
equal deleted inserted replaced
15500:d5abe76da61e 15501:2371f4aea665
54 Rebasing B onto E: 54 Rebasing B onto E:
55 55
56 $ hg rebase -s 1 -d 4 56 $ hg rebase -s 1 -d 4
57 merging A 57 merging A
58 warning: conflicts during merge. 58 warning: conflicts during merge.
59 merging A failed! 59 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
60 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) 60 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
61 [255] 61 [255]
62 62
63 Force a commit on C during the interruption: 63 Force a commit on C during the interruption:
64 64
86 Resume the rebasing: 86 Resume the rebasing:
87 87
88 $ hg rebase --continue 88 $ hg rebase --continue
89 merging A 89 merging A
90 warning: conflicts during merge. 90 warning: conflicts during merge.
91 merging A failed! 91 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
92 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) 92 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
93 [255] 93 [255]
94 94
95 Solve the conflict and go on: 95 Solve the conflict and go on:
96 96
140 Rebasing B onto E: 140 Rebasing B onto E:
141 141
142 $ hg rebase -s 1 -d 4 142 $ hg rebase -s 1 -d 4
143 merging A 143 merging A
144 warning: conflicts during merge. 144 warning: conflicts during merge.
145 merging A failed! 145 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
146 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) 146 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
147 [255] 147 [255]
148 148
149 Force a commit on B' during the interruption: 149 Force a commit on B' during the interruption:
150 150