HomePhabricator

merge: don't grab wlock when merging in memory

Authored by martinvonz.

Description

merge: don't grab wlock when merging in memory

I noticed this because we have an internal extension that does an
in-memory rebase while holding only a repo lock, which resulted in a
developer warning about the working copy lock being taken after the
repo lock.

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

Details

Committed
martinvonzThu, Jun 25, 2:17 AM
Differential Revision
D8665: merge: don't grab wlock when merging in memory
Parents
rHGf2de8f31cb59: pycompat: use os.fsencode() to re-encode sys.argv
Branches
Unknown
Tags
Unknown