This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2877

tests: demonstrate aborted rebase strips commits that didn't need rebasing
ClosedPublic

Authored by martinvonz on Mar 16 2018, 1:36 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGb9a6ee2066f9: tests: demonstrate aborted rebase strips commits that didn't need rebasing
Summary

I haven't verified, but this has probably been broken ever since I
added the feature in 78496ac30025 (rebase: allow rebase even if some
revisions need no rebase (BC) (issue5422), 2017-05-11).

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 16 2018, 1:36 AM
martinvonz added a comment.Mar 16 2018, 1:40 AM

I'm not sure if you can tell in the Phabricator UI, but this series is meant for stable.

yuja accepted this revision.Mar 19 2018, 10:09 AM
This revision is now accepted and ready to land.Mar 19 2018, 10:09 AM
yuja added a comment.Mar 19 2018, 10:09 AM

Queued for stable, thanks.

Closed by commit rHGb9a6ee2066f9: tests: demonstrate aborted rebase strips commits that didn't need rebasing (authored by martinvonz). · Explain WhyMar 19 2018, 10:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-partial.t (30 lines)

Diff 7115

tests/test-rebase-partial.t

| x 3: 26805aba1e60 C | x 3: 26805aba1e60 C
|/ |/
| x 2: b18e25de2cf5 D | x 2: b18e25de2cf5 D
| | | |
o | 1: 112478962961 B o | 1: 112478962961 B
|/ |/
o 0: 426bada5c675 A o 0: 426bada5c675 A
Abort doesn't lose the commits that were already in the right place
$ hg init abort
$ cd abort
$ hg debugdrawdag <<EOF
> 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 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). the hole (B below), not on top of the destination (A).
$ rebasewithdag -r B+D -d A <<EOF $ rebasewithdag -r B+D -d A <<EOF
> D > D
> | > |
> C > C
> | > |