This is an archive of the discontinued Mercurial Phabricator instance.

overlayworkingctx: add _auditconflicts to write()

Authored by phillco on Oct 26 2017, 12:48 AM.



Alas, part of Mercurial's conflict detection (for file<->folder conflicts,
for example) depends on the filesystem. We don't have the filesystem with IMM,
so we have to run these checks ourselves.

Diff Detail

rHG Mercurial
Lint Skipped
Unit Tests Skipped

Event Timeline

phillco updated this revision to Diff 4187.Dec 7 2017, 4:22 PM
durin42 added a subscriber: durin42.Dec 7 2017, 4:43 PM
durin42 added inline comments.

for i in xrange(len(components)):

phillco updated this revision to Diff 4206.Dec 7 2017, 4:44 PM
durin42 accepted this revision.Dec 7 2017, 4:54 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:54 PM
phillco marked an inline comment as done.Dec 7 2017, 7:00 PM
phillco updated this revision to Diff 4233.Dec 8 2017, 1:37 AM
This revision was automatically updated to reflect the committed changes.