179 $ hg ci -m 'commit interrupted graft' |
179 $ hg ci -m 'commit interrupted graft' |
180 abort: cannot commit an interrupted graft operation |
180 abort: cannot commit an interrupted graft operation |
181 (use "hg graft -c" to continue graft) |
181 (use "hg graft -c" to continue graft) |
182 [255] |
182 [255] |
183 |
183 |
|
184 Abort the graft and try committing: |
|
185 |
|
186 $ hg up -C . |
|
187 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 $ echo c >> e |
|
189 $ hg ci -mtest |
|
190 |
|
191 $ hg strip . --config extensions.mq= |
|
192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
193 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
|
194 |
|
195 Graft again: |
|
196 |
|
197 $ hg graft 1 5 4 3 'merge()' 2 |
|
198 skipping ungraftable merge revision 6 |
|
199 skipping already grafted revision 2 |
|
200 skipping already grafted revision 1 |
|
201 skipping already grafted revision 5 |
|
202 grafting revision 4 |
|
203 merging e |
|
204 warning: conflicts during merge. |
|
205 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
206 abort: unresolved conflicts, can't continue |
|
207 (use hg resolve and hg graft --continue) |
|
208 [255] |
|
209 |
184 Continue without resolve should fail: |
210 Continue without resolve should fail: |
185 |
211 |
186 $ hg graft -c |
212 $ hg graft -c |
187 grafting revision 4 |
213 grafting revision 4 |
188 abort: unresolved merge conflicts (see hg help resolve) |
214 abort: unresolved merge conflicts (see hg help resolve) |