comparison mercurial/merge.py @ 6350:6aa4a3fa4e60

update: no -C needed to switch branches without outstanding changes

6349:6aaf5b1d8f15

                    fastforward = True
                else:
                    raise util.Abort(_("there is nothing to merge, just use "
                                       "'hg update' or look at 'hg heads'"))
        elif not (overwrite or branchmerge):
            raise util.Abort(_("update spans branches, use 'hg merge' "
                               "or 'hg update -C' to lose changes"))
        if branchmerge and not forcemerge:
            if wc.files() or wc.deleted():
                raise util.Abort(_("outstanding uncommitted changes"))

        ### calculate phase

6350:6aa4a3fa4e60

                    fastforward = True
                else:
                    raise util.Abort(_("there is nothing to merge, just use "
                                       "'hg update' or look at 'hg heads'"))
        elif not (overwrite or branchmerge):
            if wc.files() or wc.deleted():
                raise util.Abort(_("update spans branches, use 'hg merge' "
                                   "or 'hg update -C' to lose changes"))
            # Allow jumping branches if there are no changes
            overwrite = True
        if branchmerge and not forcemerge:
            if wc.files() or wc.deleted():
                raise util.Abort(_("outstanding uncommitted changes"))

        ### calculate phase