Page MenuHomePhabricator

merge: don't grab wlock when merging in memory
ClosedPublic

Authored by martinvonz on Thu, Jun 25, 10:20 AM.

Details

Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Thu, Jun 25, 10:20 AM
pulkit accepted this revision.Thu, Jun 25, 10:49 AM
This revision is now accepted and ready to land.Thu, Jun 25, 10:49 AM
This revision was automatically updated to reflect the committed changes.