mercurial/localrepo.py

9980:2ba40cdaacb2

            if warn:
                if not rheads: # new branch requires --force
                    self.ui.warn(_("abort: push creates new"
                                   " remote branch '%s'!\n") %
                                   self[updatelb[0]].branch())
                else:
                    self.ui.warn(_("abort: push creates new remote heads!\n"))

                self.ui.status(_("(did you forget to merge?"
                                 " use push -f to force)\n"))

                        if lh in remotehds:
                            rheads = remotehds[lh]
                        else:
                            rheads = []
                        lheads = localhds[lh]
                        updatelb = [upd for upd in update
                                    if self[upd].branch() == lh]
                        if not updatelb:
                            continue
                        if not checkbranch(lheads, rheads, updatelb):
                            return None, 0
                else:
                    if not checkbranch(heads, remote_heads, update):
                        return None, 0

9982:ddc899096b7b

            if warn:
                if not rheads: # new branch requires --force
                    self.ui.warn(_("abort: push creates new"
                                   " remote branch '%s'!\n") %
                                   self[lheads[0]].branch())
                else:
                    self.ui.warn(_("abort: push creates new remote heads!\n"))

                self.ui.status(_("(did you forget to merge?"
                                 " use push -f to force)\n"))

                        if lh in remotehds:
                            rheads = remotehds[lh]
                        else:
                            rheads = []
                        lheads = localhds[lh]
                        if not checkbranch(lheads, rheads, update):
                            return None, 0
                else:
                    if not checkbranch(heads, remote_heads, update):
                        return None, 0