Show More
@@ -472,6 +472,7 b' def update(repo, node):' | |||
|
472 | 472 | def clean(repo, node, show_stats=True): |
|
473 | 473 | """forcibly switch the working directory to node, clobbering changes""" |
|
474 | 474 | stats = updaterepo(repo, node, True) |
|
475 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
|
475 | 476 | if show_stats: |
|
476 | 477 | _showstats(repo, stats) |
|
477 | 478 | return stats[3] > 0 |
@@ -181,6 +181,32 b' Commit while interrupted should fail:' | |||
|
181 | 181 | (use "hg graft -c" to continue graft) |
|
182 | 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 | 210 | Continue without resolve should fail: |
|
185 | 211 | |
|
186 | 212 | $ hg graft -c |
General Comments 0
You need to be logged in to leave comments.
Login now