Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 17388:54feb8d3bab7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 24 Aug 2012 14:53:07 -0500
parents 3738d6254bd3 45b5eb2941d0
children 99a2a4ae35e2
comparison
equal deleted inserted replaced
17387:1fce478552b8 17388:54feb8d3bab7
4267 "please merge with an explicit rev") 4267 "please merge with an explicit rev")
4268 % (branch, len(bheads)), 4268 % (branch, len(bheads)),
4269 hint=_("run 'hg heads .' to see heads")) 4269 hint=_("run 'hg heads .' to see heads"))
4270 4270
4271 parent = repo.dirstate.p1() 4271 parent = repo.dirstate.p1()
4272 if len(nbhs) == 1: 4272 if len(nbhs) <= 1:
4273 if len(bheads) > 1: 4273 if len(bheads) > 1:
4274 raise util.Abort(_("heads are bookmarked - " 4274 raise util.Abort(_("heads are bookmarked - "
4275 "please merge with an explicit rev"), 4275 "please merge with an explicit rev"),
4276 hint=_("run 'hg heads' to see all heads")) 4276 hint=_("run 'hg heads' to see all heads"))
4277 if len(repo.heads()) > 1: 4277 if len(repo.heads()) > 1: