comparison mercurial/merge.py @ 16092:914bc95e227b

update: use normal update path with --check (issue2450)

This avoids clobbering unknown files on update by not using overwrite mode.

16090:e1d8218d733b

            elif onode is None:
                raise util.Abort(_("crosses branches (merge branches or update"
                                   " --check to force update)"))
            else:
                # Allow jumping branches if clean and specific rev given
                overwrite = True

        ### calculate phase
        action = []
        wc.status(unknown=True) # prime cache
        folding = not util.checkcase(repo.path)

16092:914bc95e227b

            elif onode is None:
                raise util.Abort(_("crosses branches (merge branches or update"
                                   " --check to force update)"))
            else:
                # Allow jumping branches if clean and specific rev given
                pa = p1

        ### calculate phase
        action = []
        wc.status(unknown=True) # prime cache
        folding = not util.checkcase(repo.path)