equal
deleted
inserted
replaced
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: |