( )⚙ D10256 tests: test divergence created during interrupted rebase

This is an archive of the discontinued Mercurial Phabricator instance.

tests: test divergence created during interrupted rebase
ClosedPublic

Authored by martinvonz on Mar 24 2021, 2:24 AM.

Details

Summary

If a rebase runs into conflicts and the user somehow rewrites an
unrebased commit in the rebase set while the rebase is interrupted,
continuing it might result in divergence. It turns out that we decide
to skip the commit. That seems to make sense, but it wasn't obvious to
me that that's what we should do. Either way, this patch adds a test
case for the current behavior.

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

martinvonz created this revision.Mar 24 2021, 2:24 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.