equal
deleted
inserted
replaced
642 |
642 |
643 if ui.debugflag: |
643 if ui.debugflag: |
644 ui.write(_('committed changeset %d:%s\n') % (rev,hex(node))) |
644 ui.write(_('committed changeset %d:%s\n') % (rev,hex(node))) |
645 elif ui.verbose: |
645 elif ui.verbose: |
646 ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) |
646 ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) |
|
647 |
|
648 ms = merge_.mergestate(repo) |
|
649 ms.reset(node) |
647 |
650 |
648 def copy(ui, repo, *pats, **opts): |
651 def copy(ui, repo, *pats, **opts): |
649 """mark files as copied for the next commit |
652 """mark files as copied for the next commit |
650 |
653 |
651 Mark dest as having copies of source files. If dest is a |
654 Mark dest as having copies of source files. If dest is a |