Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2761:0aa458261901

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix hg backup option recommendation for auto-merge
author Christian Ebert <blacktrash@gmx.net>
date Wed, 02 Aug 2006 03:17:06 +0200
parents e6bef16b6cec
children 2df98f616645
comparison
equal deleted inserted replaced
2760:e6bef16b6cec 2761:0aa458261901
940 ui.status(_('merging with changeset %s\n') % nice(op1)) 940 ui.status(_('merging with changeset %s\n') % nice(op1))
941 doupdate(ui, repo, hex(op1), **opts) 941 doupdate(ui, repo, hex(op1), **opts)
942 else: 942 else:
943 ui.status(_('the backout changeset is a new head - ' 943 ui.status(_('the backout changeset is a new head - '
944 'do not forget to merge\n')) 944 'do not forget to merge\n'))
945 ui.status(_('(use "backout -m" if you want to auto-merge)\n')) 945 ui.status(_('(use "backout --merge" '
946 'if you want to auto-merge)\n'))
946 947
947 def bundle(ui, repo, fname, dest=None, **opts): 948 def bundle(ui, repo, fname, dest=None, **opts):
948 """create a changegroup file 949 """create a changegroup file
949 950
950 Generate a compressed changegroup file collecting all changesets 951 Generate a compressed changegroup file collecting all changesets