diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -231,8 +231,10 @@ def strip(ui, repo, nodelist, backup=Tru ui.warn(_("strip failed, full bundle stored in '%s'\n") % vfs.join(backupfile)) if chgrpfile: - ui.warn(_("strip failed, partial bundle stored in '%s'\n") + ui.warn(_("strip failed, unrecovered changes stored in '%s'\n") % vfs.join(chgrpfile)) + ui.warn(_("(fix the problem, then recover the changesets with " + "\"hg unbundle '%s'\")\n") % vfs.join(chgrpfile)) raise else: if chgrpfile: diff --git a/tests/test-strip.t b/tests/test-strip.t --- a/tests/test-strip.t +++ b/tests/test-strip.t @@ -375,7 +375,8 @@ Failed hook while applying "saveheads" b transaction abort! rollback completed strip failed, full bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob) - strip failed, partial bundle stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) + strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) + (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) abort: pretxnchangegroup.bad hook exited with status 1 [255] $ restore