Mercurial > hg

diff tests/test-merge-revert2.t @ 44999:d1471dbbdd63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 24 Jun 2020 23:17:56 -0700
parents ce3a133f71b3
children 55c6ebd11cb9
line wrap: on
line diff