This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4407

tests: add test showing that rebase of extinct commit with successor fails
ClosedPublic

Authored by martinvonz on Aug 28 2018, 3:33 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGa3af500a1362: tests: add test showing that rebase of extinct commit with successor fails

Summary

As the test case shows, attempting to rebase a commit that has a
successor that is not in the rebase set and not in the destination
currently fails because it "will cause divergences". However, it
doesn't seem like there's any harm in skipping the extinct commit. I
suspect this case missed simply because extinct revisions are usually
hidden.

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.Aug 28 2018, 3:33 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 28 2018, 3:33 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz added a child revision: D4408: rebase: skip extinct revisions even if it has no successor in rebase set.Aug 28 2018, 3:33 AM

Closed by commit rHGa3af500a1362: tests: add test showing that rebase of extinct commit with successor fails (authored by martinvonz). · Explain WhyAug 29 2018, 9:04 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-rebase-obsolete.t (22 lines)

Status	Author	Revision
Needs Revision	martinvonz	D4409 rebase: skip all obsolete revisions, just warn about divergence
Closed	martinvonz	D4408 rebase: skip extinct revisions even if it has no successor in rebase set
Closed	martinvonz	D4407 tests: add test showing that rebase of extinct commit with successor fails
Closed	martinvonz	D4406 tests: add log output after stripping for context for next test

Diff 10641

tests/test-rebase-obsolete.t

	\| x \| 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)			\| x \| 2:b18e25de2cf5 D (rewritten using replace as 1:112478962961)
	\| \|/			\| \|/
	o / 1:112478962961 B			o / 1:112478962961 B
	\|/			\|/
	o 0:426bada5c675 A			o 0:426bada5c675 A

	$ cd ..			$ cd ..

				Rebase merge where extinct node has successor that is not an ancestor of
				destination

				$ hg init extinct-with-succ-not-in-dest
				$ cd extinct-with-succ-not-in-dest

				$ hg debugdrawdag <<EOF
				> E C # replace: C -> E
				> \| \|
				> D B
				> \|/
				> A
				> EOF

				TODO: There doesn't seem to be much reason to fail this rebase. Make it pass?
				$ hg rebase -d D -s B
				abort: this rebase will cause divergences from: 26805aba1e60
				(to force the rebase please set experimental.evolution.allowdivergence=True)
				[255]

				$ cd ..

	$ hg init p2-succ-in-dest-c			$ hg init p2-succ-in-dest-c
	$ cd p2-succ-in-dest-c			$ cd p2-succ-in-dest-c

	The scenario here was that B::D were developed on default. B was queued on			The scenario here was that B::D were developed on default. B was queued on
	stable, but amended before being push to hg-committed. C was queued on default,			stable, but amended before being push to hg-committed. C was queued on default,
	along with unrelated J.			along with unrelated J.

	$ hg debugdrawdag <<EOF			$ hg debugdrawdag <<EOF

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10614		Aug 28 2018, 3:33 AM	★	★
Diff 2	10641	rHGa3af500a1362ff061f1f5ef2e4814478b8b6738a	Jul 11 2018, 3:26 PM	★	★