equal
deleted
inserted
replaced
5663 |
5663 |
5664 finally: |
5664 finally: |
5665 wlock.release() |
5665 wlock.release() |
5666 |
5666 |
5667 # Nudge users into finishing an unfinished operation |
5667 # Nudge users into finishing an unfinished operation |
5668 if not list(ms.unresolved()): |
5668 unresolvedf = list(ms.unresolved()) |
|
5669 driverresolvedf = list(ms.driverresolved()) |
|
5670 if not unresolvedf and not driverresolvedf: |
5669 ui.status(_('(no more unresolved files)\n')) |
5671 ui.status(_('(no more unresolved files)\n')) |
|
5672 elif not unresolvedf: |
|
5673 ui.status(_('(no more unresolved files -- ' |
|
5674 'run "hg resolve --all" to conclude)\n')) |
5670 |
5675 |
5671 return ret |
5676 return ret |
5672 |
5677 |
5673 @command('revert', |
5678 @command('revert', |
5674 [('a', 'all', None, _('revert all changes when no arguments given')), |
5679 [('a', 'all', None, _('revert all changes when no arguments given')), |