Show More
@@ -3363,6 +3363,17 b' def clearunfinished(repo):' | |||||
3363 | if clearable and repo.vfs.exists(f): |
|
3363 | if clearable and repo.vfs.exists(f): | |
3364 | util.unlink(repo.join(f)) |
|
3364 | util.unlink(repo.join(f)) | |
3365 |
|
3365 | |||
|
3366 | afterresolvedstates = [ | |||
|
3367 | ] | |||
|
3368 | ||||
|
3369 | def checkafterresolved(repo): | |||
|
3370 | contmsg = _("continue: %s\n") | |||
|
3371 | for f, msg in afterresolvedstates: | |||
|
3372 | if repo.vfs.exists(f): | |||
|
3373 | repo.ui.warn(contmsg % msg) | |||
|
3374 | return | |||
|
3375 | repo.ui.note(contmsg % _("hg commit")) | |||
|
3376 | ||||
3366 | class dirstateguard(object): |
|
3377 | class dirstateguard(object): | |
3367 | '''Restore dirstate at unexpected failure. |
|
3378 | '''Restore dirstate at unexpected failure. | |
3368 |
|
3379 |
@@ -6003,6 +6003,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
6003 | driverresolvedf = list(ms.driverresolved()) |
|
6003 | driverresolvedf = list(ms.driverresolved()) | |
6004 | if not unresolvedf and not driverresolvedf: |
|
6004 | if not unresolvedf and not driverresolvedf: | |
6005 | ui.status(_('(no more unresolved files)\n')) |
|
6005 | ui.status(_('(no more unresolved files)\n')) | |
|
6006 | cmdutil.checkafterresolved(repo) | |||
6006 | elif not unresolvedf: |
|
6007 | elif not unresolvedf: | |
6007 | ui.status(_('(no more unresolved files -- ' |
|
6008 | ui.status(_('(no more unresolved files -- ' | |
6008 | 'run "hg resolve --all" to conclude)\n')) |
|
6009 | 'run "hg resolve --all" to conclude)\n')) |
@@ -714,6 +714,7 b' Test usage of `hg resolve` in case of co' | |||||
714 | my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 |
|
714 | my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 | |
715 | premerge successful |
|
715 | premerge successful | |
716 | (no more unresolved files) |
|
716 | (no more unresolved files) | |
|
717 | continue: hg commit | |||
717 |
|
|
718 | $ hg status | |
718 | M foo |
|
719 | M foo | |
719 | ? foo.orig |
|
720 | ? foo.orig |
General Comments 0
You need to be logged in to leave comments.
Login now