D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing
This revision was automatically updated to reflect the committed changes. Closed by commit rHGb9a6ee2066f9: tests: demonstrate aborted rebase strips commits that didnt need rebasing (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2877?vs=7074=7115 REVISION DETAIL https://phab.mercurial-scm.org/D2877 AFFECTED FILES tests/test-rebase-partial.t CHANGE DETAILS diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t --- a/tests/test-rebase-partial.t +++ b/tests/test-rebase-partial.t @@ -69,6 +69,36 @@ |/ o 0: 426bada5c675 A +Abort doesn't lose the commits that were already in the right place + + $ hg init abort + $ cd abort + $ hg debugdrawdag < C + > | + > B D # B/file = B + > |/ # D/file = D + > A + > EOF + $ hg rebase -r C+D -d B + rebasing 2:ef8c0fe0897b "D" (D) + merging file + warning: conflicts while merging file! (edit, then use 'hg resolve --mark') + unresolved conflicts (see hg resolve, then hg rebase --continue) + [1] + $ hg rebase --abort + saved backup bundle to $TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg + rebase aborted +BROKEN: C got stripped + $ hg tglog + o 2: ef8c0fe0897b D + | + | o 1: 594087dbaf71 B + |/ + o 0: 426bada5c675 A + + $ cd .. + Rebase with "holes". The commits after the hole should end up on the parent of the hole (B below), not on top of the destination (A). To: martinvonz, #hg-reviewers, yuja Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing
yuja added a comment. Queued for stable, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2877 To: martinvonz, #hg-reviewers, yuja Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing
martinvonz added a comment. I'm not sure if you can tell in the Phabricator UI, but this series is meant for stable. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2877 To: martinvonz, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing
martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I haven't verified, but this has probably been broken ever since I added the feature in https://phab.mercurial-scm.org/rHG78496ac300255e9996b3e282086661afc08af37c (rebase: allow rebase even if some revisions need no rebase (BC) (issue5422), 2017-05-11). REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2877 AFFECTED FILES tests/test-rebase-partial.t CHANGE DETAILS diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t --- a/tests/test-rebase-partial.t +++ b/tests/test-rebase-partial.t @@ -69,6 +69,36 @@ |/ o 0: 426bada5c675 A +Abort doesn't lose the commits that were already in the right place + + $ hg init abort + $ cd abort + $ hg debugdrawdag < C + > | + > B D # B/file = B + > |/ # D/file = D + > A + > EOF + $ hg rebase -r C+D -d B + rebasing 2:ef8c0fe0897b "D" (D) + merging file + warning: conflicts while merging file! (edit, then use 'hg resolve --mark') + unresolved conflicts (see hg resolve, then hg rebase --continue) + [1] + $ hg rebase --abort + saved backup bundle to $TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg + rebase aborted +BROKEN: C got stripped + $ hg tglog + o 2: ef8c0fe0897b D + | + | o 1: 594087dbaf71 B + |/ + o 0: 426bada5c675 A + + $ cd .. + Rebase with "holes". The commits after the hole should end up on the parent of the hole (B below), not on top of the destination (A). To: martinvonz, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
