This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6357

tests: demonstrate another failure with in-memory rebase and copies
ClosedPublic

Authored by martinvonz on May 10 2019, 5:02 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG5265c7d47213: tests: demonstrate another failure with in-memory rebase and copies

Summary

This is a similar to dd1ab72be983 (test: demonstrate crash with
in-memory rebase and copies, 2019-03-14). The new failure started with
57203e0210f8 (copies: calculate mergecopies() based on pathcopies(),
2019-04-11). It happens in the call to mergemod.update() on
rebase.py:1268 where we call mergemod.update() to graft a node. Since
the mergecopies() rewrite, that calls _related() with the filectx from
the overlaywctx instead of a filectx from the changectx where the file
was last modified. Either should be fine, so I don't think that's
a bug.

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.May 10 2019, 5:02 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMay 10 2019, 5:02 PM

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

martinvonz added a child revision: D6358: overlaycontext: allow calling copydata() on clean context.May 10 2019, 5:02 PM

Closed by commit rHG5265c7d47213: tests: demonstrate another failure with in-memory rebase and copies (authored by martinvonz). · Explain WhyMay 15 2019, 2:02 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-rebase-inmemory.t (15 lines)

Status	Author	Revision
Closed	martinvonz	D6374 context: default to using branch from dirstate only in workingctx
Closed	martinvonz	D6366 context: let caller pass in branch to committablectx.__init__()
Closed	martinvonz	D6365 context: move contents of committablectx.markcommitted() to workingctx
Closed	martinvonz	D6364 tests: demonstrate that close-head command updates working copy
Closed	martinvonz	D6363 context: move walk() and match() overrides from committablectx to workingctx
Closed	martinvonz	D6362 context: move flags overrides from committablectx to workingctx
Closed	martinvonz	D6219 context: reuse changectx._copies() in all but workingctx
Closed	martinvonz	D6361 overlayworkingctx: don't include added-then-deleted files in memctx
Closed	martinvonz	D6360 tests: demonstrate loss of changeset copy metadata on rebase
Closed	martinvonz	D6358 overlaycontext: allow calling copydata() on clean context
Closed	martinvonz	D6357 tests: demonstrate another failure with in-memory rebase and copies

Diff 15099

tests/test-rebase-inmemory.t


	$ hg rebase -b 5 -d tip			$ hg rebase -b 5 -d tip
	rebasing 3:ca58782ad1e4 "b"			rebasing 3:ca58782ad1e4 "b"
	rebasing 5:71cb43376053 "merge"			rebasing 5:71cb43376053 "merge"
	note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes			note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes

	$ cd ..			$ cd ..

				Test rebasing a commit with copy information

				$ hg init rebase-rename
				$ cd rebase-rename
				$ echo a > a
				$ hg ci -Aqm 'add a'
				$ echo a2 > a
				$ hg ci -m 'modify a'
				$ hg co -q 0
				$ hg mv a b
				$ hg ci -qm 'rename a to b'
				$ hg rebase -d 1 2>&1 \| grep '** ProgrammingError'
				** ProgrammingError: copydata() called on clean context
				$ cd ..

	Test rebasing when the file we are merging in destination is empty			Test rebasing when the file we are merging in destination is empty

	$ hg init test			$ hg init test
	$ cd test			$ cd test
	$ echo a > foo			$ echo a > foo
	$ hg ci -Aqm 'added a to foo'			$ hg ci -Aqm 'added a to foo'

	$ rm foo			$ rm foo

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	15050		May 10 2019, 5:02 PM	★	★
Diff 2	15099	rHG5265c7d47213bf11de44dd9f70e3bae2b40f8f96	May 10 2019, 1:23 PM	★	★