This is an archive of the discontinued Mercurial Phabricator instance.

merge: add a back_out() function to encapsulate update()
ClosedPublic

Authored by martinvonz on Sep 21 2020, 4:36 PM.

Details

Summary

I've sent several earlier patches adding merge.clean_update(),
merge.merge() etc, one function for each use case. This patch
continues that work. I plan to hide the complex update() eventually.

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.