( )⚙ D1212 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
ClosedPublic

Authored by phillco on Oct 23 2017, 3:44 PM.

Details

Summary

Merge conflicts might be supported in the future, but for now are kept out of
scope.

Any places where we used to call flushall() should be replaced with some kind
of exception. At this point, IMM M1 is no longer supported.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco set the repository for this revision to rHG Mercurial.
phillco updated this revision to Diff 3551.Nov 16 2017, 12:13 AM
phillco set the repository for this revision to rHG Mercurial.Nov 16 2017, 1:14 AM
phillco updated this revision to Diff 4038.Dec 1 2017, 3:02 AM
phillco retitled this revision from filemerge: raise InMemoryMergeConflictsError whenever we hit merge conflicts to filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM.Dec 1 2017, 3:09 AM
phillco updated this revision to Diff 4045.Dec 1 2017, 3:38 AM
This revision was automatically updated to reflect the committed changes.