view mercurial/__init__.py @ 45412:aaeccdb6e654 stable

repoview: pin revisions for `local` and `other` when a merge is active

I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes
`p1` and updating to the successor results in merge conflicts.  The problem was
resolving them failed immediately, complaining that the old checkout was
filtered.

The change in `test-rebase-obsolete.t` is because there's an outstanding merge
conflict in a rebase operation.  The summary prompt to merge seems incorrect for
this scenario, but that's an existing issue.

Differential Revision: https://phab.mercurial-scm.org/D8980

# __init__.py - Startup and module loading logic for Mercurial.
#
# Copyright 2015 Gregory Szorc <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

# Allow 'from mercurial import demandimport' to keep working.
import hgdemandimport

demandimport = hgdemandimport