This is an archive of the discontinued Mercurial Phabricator instance.

merge: refactor code to advise fsmonitor in separate function
ClosedPublic

Authored by pulkit on Jul 14 2020, 8:30 AM.

Details

Summary

merge.update() is quite hard to understand, found this an easy win.

The end goal is to have better organized merge and mergestate handling and then
fix some related bugs.

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

pulkit created this revision.Jul 14 2020, 8:30 AM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.