Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 6844:a38dff85d31f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use correct branch name for counting heads
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 21 Jul 2008 13:17:51 +0200
parents b114a8c7998f
children 0b6f2fa5e03f
comparison
equal deleted inserted replaced
6843:b114a8c7998f 6844:a38dff85d31f
1880 if not node: 1880 if not node:
1881 node = rev 1881 node = rev
1882 1882
1883 if not node: 1883 if not node:
1884 branch = repo.changectx(None).branch() 1884 branch = repo.changectx(None).branch()
1885 bheads = repo.branchheads() 1885 bheads = repo.branchheads(branch)
1886 if len(bheads) > 2: 1886 if len(bheads) > 2:
1887 raise util.Abort(_("branch '%s' has %d heads - " 1887 raise util.Abort(_("branch '%s' has %d heads - "
1888 "please merge with an explicit rev") % 1888 "please merge with an explicit rev") %
1889 (branch, len(bheads))) 1889 (branch, len(bheads)))
1890 1890