This is an archive of the discontinued Mercurial Phabricator instance.

merge: don't check for unknown files in IMM
ClosedPublic

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

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 added inline comments.
mercurial/merge.py
664

Should this also short-circuit?

phillco set the repository for this revision to rHG Mercurial.
phillco updated this revision to Diff 3554.Nov 16 2017, 1:00 AM
phillco marked an inline comment as done.Nov 16 2017, 1:03 AM
phillco added inline comments.
mercurial/merge.py
664

Good catch, thanks.

phillco marked an inline comment as done.Nov 16 2017, 1:03 AM
phillco updated this revision to Diff 3559.
phillco set the repository for this revision to rHG Mercurial.Nov 16 2017, 1:14 AM
durin42 accepted this revision.Dec 7 2017, 2:51 PM
This revision is now accepted and ready to land.Dec 7 2017, 2:51 PM

This and one other one are marked accepted by me, but the rebase was trickier than I have time for right now. Could you rebase them and reupload? Thanks!

phillco updated this revision to Diff 4176.Dec 7 2017, 4:22 PM
This revision was automatically updated to reflect the committed changes.