Page MenuHomePhabricator

rebase: add experimental.inmemory.nomergedriver to turn off IMM
AbandonedPublic

Authored by phillco on Jan 5 2018, 1:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This gives us an easy way to ensure IMM is disabled automatically if the user configures a
mergedriver script.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Jan 5 2018, 1:01 PM
phillco abandoned this revision.Jan 5 2018, 1:14 PM
durham added a subscriber: durham.Jan 5 2018, 1:14 PM
durham added inline comments.
hgext/rebase.py
812

I think we probably want IMM disabled by default if merge drivers are specified. If the merge-driver does IO during the preprocess step, it could cause problems in an IMM situation. So I don't think we can enable IMM by default in the merge-driver case until merge-driver enforces (or at least documents) that there should be no IO during preprocess.