comparison mercurial/commands.py @ 10355:a5576908b589

merge: add hints about the use of 'hg heads' to find the rev to merge

10354:844d83da2da9

    if not node:
        branch = repo.changectx(None).branch()
        bheads = repo.branchheads(branch)
        if len(bheads) > 2:
            raise util.Abort(_("branch '%s' has %d heads - "
                               "please merge with an explicit rev") %
                             (branch, len(bheads)))

        parent = repo.dirstate.parents()[0]
        if len(bheads) == 1:
            if len(repo.heads()) > 1:
                raise util.Abort(_("branch '%s' has one head - "
                                   "please merge with an explicit rev") %
                                 branch)
            msg = _('there is nothing to merge')
            if parent != repo.lookup(repo[None].branch()):
                msg = _('%s - use "hg update" instead') % msg
            raise util.Abort(msg)

10355:a5576908b589

    if not node:
        branch = repo.changectx(None).branch()
        bheads = repo.branchheads(branch)
        if len(bheads) > 2:
            ui.warn(_("abort: branch '%s' has %d heads - "
                      "please merge with an explicit rev\n")
                    % (branch, len(bheads)))
            ui.status(_("(run 'hg heads .' to see heads)\n"))
            return False

        parent = repo.dirstate.parents()[0]
        if len(bheads) == 1:
            if len(repo.heads()) > 1:
                ui.warn(_("abort: branch '%s' has one head - "
                          "please merge with an explicit rev\n" % branch))
                ui.status(_("(run 'hg heads' to see all heads)\n"))
                return False
            msg = _('there is nothing to merge')
            if parent != repo.lookup(repo[None].branch()):
                msg = _('%s - use "hg update" instead') % msg
            raise util.Abort(msg)