This is an archive of the discontinued Mercurial Phabricator instance.

merge-halt: demonstrate unshelve issue with merge.on-failure=halt
ClosedPublic

Authored by spectral on Oct 19 2021, 9:27 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

spectral created this revision.Oct 19 2021, 9:27 PM
Alphare accepted this revision.Oct 20 2021, 5:07 AM
Alphare added a subscriber: Alphare.

This looks good, but it should go on stable (as should the fix), I'll tell you if that doesn't apply.

tests/test-merge-halt.t
197

FYI there is (missing-correct-output !) and (known-bad-output !) for that kind of expected changes.

This revision is now accepted and ready to land.Oct 20 2021, 5:07 AM