This is an archive of the discontinued Mercurial Phabricator instance.

status: process `from_p2` file the same as `merged` one
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:40 PM.

Details

Summary

What matters here is that the file constains information coming from the second
parent and should be considered modified on plain `hg status.

So we can process from_p2 file sooner. It also highlight that we probably
don't need the merged/from_p2 distinction at higher level.

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

marmoute created this revision.Oct 2 2021, 8:40 PM
baymax updated this revision to Diff 30596.Oct 3 2021, 6:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Oct 3 2021, 5:13 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:13 PM
This revision was automatically updated to reflect the committed changes.