Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2642:f47432ae5376

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling fix
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 21 Jul 2006 02:31:59 +0200
parents 46182568b4ce
children e57df017640d
comparison
equal deleted inserted replaced
2641:46182568b4ce 2642:f47432ae5376
2673 else: 2673 else:
2674 p1, p2 = repo.dirstate.parents() 2674 p1, p2 = repo.dirstate.parents()
2675 if p1 == nullid: 2675 if p1 == nullid:
2676 raise util.Abort(_('no revision to tag')) 2676 raise util.Abort(_('no revision to tag'))
2677 if p2 != nullid: 2677 if p2 != nullid:
2678 raise util.Abort(_('outstanding uncommited merges')) 2678 raise util.Abort(_('outstanding uncommitted merges'))
2679 r = hex(p1) 2679 r = hex(p1)
2680 2680
2681 repo.tag(name, r, opts['local'], opts['message'], opts['user'], 2681 repo.tag(name, r, opts['local'], opts['message'], opts['user'],
2682 opts['date']) 2682 opts['date'])
2683 2683