This is an archive of the discontinued Mercurial Phabricator instance.

resolve: add a flag for the default behavior of re-merging
ClosedPublic

Authored by valentin.gatienbaron on Aug 26 2018, 7:01 PM.

Details

Summary

On its own, it's not useful, but the next commit will add an hgrc
config option to make it mandatory.

There is no short option, as -r almost always means --rev and this
option doesn't seem like it would be so common as to mandate a short
option.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Aug 29 2018, 1:20 PM

This patch lacks tests. Please add some tests.

Thanks for accepting (some of) my other changes.
I added a couple of simple tests. I could add one for the hint, but I figured it's probably not worth it?

pulkit accepted this revision.Sep 1 2018, 4:31 PM

I added a couple of simple tests. I could add one for the hint, but I figured it's probably not worth it?

I *think* each case is worth a test and help us increasing code coverage.

This revision was automatically updated to reflect the committed changes.