Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 7739:edcb56991afe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with mpm
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 07 Feb 2009 23:29:12 +0100
parents 26bdb7109170 9f73bddb9d0b
children ec9b726a9428
comparison
equal deleted inserted replaced
7738:db366ec8d0a4 7739:edcb56991afe
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