This is an archive of the discontinued Mercurial Phabricator instance.

tests: add test for issue5678
ClosedPublic

Authored by martinvonz on Sep 14 2017, 2:54 PM.

Details

Summary

In addition to a test case for the direct problem described in the bug
report, this also adds a test case showing how obsmarkers can also get
lost when not using generaldelta.

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.Sep 14 2017, 2:54 PM
quark accepted this revision.Sep 14 2017, 3:09 PM
quark added a subscriber: quark.
quark added inline comments.
tests/test-rebase-scenario-global.t
392

Maybe add {rev} so the following hg rebase -s 1 -d 2 becomes easier to read.

indygreg accepted this revision.Sep 14 2017, 3:23 PM
This revision is now accepted and ready to land.Sep 14 2017, 3:23 PM
martinvonz marked an inline comment as done.Sep 14 2017, 3:42 PM
martinvonz updated this revision to Diff 1828.Sep 14 2017, 3:42 PM
indygreg accepted this revision.Sep 14 2017, 4:05 PM
martinvonz edited the summary of this revision. (Show Details)Sep 14 2017, 4:20 PM
martinvonz updated this revision to Diff 1832.
indygreg accepted this revision.Sep 14 2017, 7:44 PM
durin42 accepted this revision.Sep 15 2017, 11:31 AM
This revision was automatically updated to reflect the committed changes.