Show More
@@ -231,8 +231,10 b' def strip(ui, repo, nodelist, backup=Tru' | |||||
231 | ui.warn(_("strip failed, full bundle stored in '%s'\n") |
|
231 | ui.warn(_("strip failed, full bundle stored in '%s'\n") | |
232 | % vfs.join(backupfile)) |
|
232 | % vfs.join(backupfile)) | |
233 | if chgrpfile: |
|
233 | if chgrpfile: | |
234 |
ui.warn(_("strip failed, |
|
234 | ui.warn(_("strip failed, unrecovered changes stored in '%s'\n") | |
235 | % vfs.join(chgrpfile)) |
|
235 | % vfs.join(chgrpfile)) | |
|
236 | ui.warn(_("(fix the problem, then recover the changesets with " | |||
|
237 | "\"hg unbundle '%s'\")\n") % vfs.join(chgrpfile)) | |||
236 | raise |
|
238 | raise | |
237 | else: |
|
239 | else: | |
238 | if chgrpfile: |
|
240 | if chgrpfile: |
@@ -375,7 +375,8 b' Failed hook while applying "saveheads" b' | |||||
375 | transaction abort! |
|
375 | transaction abort! | |
376 | rollback completed |
|
376 | rollback completed | |
377 | strip failed, full bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) |
|
377 | strip failed, full bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) | |
378 |
strip failed, |
|
378 | strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) | |
|
379 | (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) | |||
379 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
380 | abort: pretxnchangegroup.bad hook exited with status 1 | |
380 | [255] |
|
381 | [255] | |
381 | $ restore |
|
382 | $ restore |
General Comments 0
You need to be logged in to leave comments.
Login now