Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 7848:89e05c02a4af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 30cb79d84352
children 74c3baca65c9
comparison
equal deleted inserted replaced
7847:30cb79d84352 7848:89e05c02a4af
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)
650 647
651 def copy(ui, repo, *pats, **opts): 648 def copy(ui, repo, *pats, **opts):
652 """mark files as copied for the next commit 649 """mark files as copied for the next commit
653 650
654 Mark dest as having copies of source files. If dest is a 651 Mark dest as having copies of source files. If dest is a