comparison mercurial/merge.py @ 16492:774e2dcd0a65 stable

update: fix case-collision with a clean wd and no --clean

cbf2ea2f5ca1 introduced some logic to avoid case-collision detection between
source and destination revisions when it does not make sense: clean or to be
cleaned working directories. Unfortunately, part of it was flawed and the
related test was broken by another bug.

This patch disables cross revision case collision detection for updates without
option or with --check, if the working directory is clean.

16491:bfe89d65d651

        ### calculate phase
        action = []
        folding = not util.checkcase(repo.path)
        if folding:
            # collision check is not needed for clean update
            if not branchmerge and force:
                _checkcollision(p2, None)
            else:
                _checkcollision(p2, wc)
        if not force:
            _checkunknown(repo, wc, p2)

16492:774e2dcd0a65

        ### calculate phase
        action = []
        folding = not util.checkcase(repo.path)
        if folding:
            # collision check is not needed for clean update
            if (not branchmerge and
                (force or not wc.dirty(missing=True, branch=False))):
                _checkcollision(p2, None)
            else:
                _checkcollision(p2, wc)
        if not force:
            _checkunknown(repo, wc, p2)