This is an archive of the discontinued Mercurial Phabricator instance.

merge: additional test cases to show merge-halting behavior
ClosedPublic

Authored by ryanmce on Oct 5 2017, 5:16 AM.

Download Raw Diff

Details

Reviewers

mbthomas
durin42

Group Reviewers

hg-reviewers

Commits

rHG05535d0dea68: merge: additional test cases to show merge-halting behavior
rHGe10bac797852: merge: additional test cases to show merge-halting behavior

Summary

In the previous patches, we allowed the user to specify that
a merge process should be halted when a filemerge fails.

This patch adds tests that show additional places this logic
can be utilized -- via the options to do additional post-filemerge
checks to determine if a file merge was successful.

Diff Detail

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

ryanmce created this revision.Oct 5 2017, 5:16 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 5 2017, 5:16 AM

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

ryanmce added a child revision: D953: merge: use filemerge failure handler in post-filemerge checks checks.Oct 5 2017, 5:17 AM

mbthomas accepted this revision.Oct 6 2017, 5:22 AM

ryanmce updated this revision to Diff 2503.Oct 6 2017, 9:51 AM

quark set the repository for this revision to rHG Mercurial.Oct 7 2017, 1:14 PM

D953 is abandoned- should this be as well?

D953 is abandoned- should this be as well?

No, but it should probably be retitled. I'll do that now.

It turns out that the behavior did change, but only slightly, and not in a useful way, with the D953. This still adds useful tests that show that the other ways of saying a file merge process didn't go well also can halt the merge.

ryanmce retitled this revision from merge: additional test cases to show changing behavior to merge: additional test cases to show merge-halting behavior.Oct 17 2017, 6:17 AM

ryanmce edited the summary of this revision. (Show Details)

durin42 accepted this revision.Oct 18 2017, 4:09 PM

This revision is now accepted and ready to land.Oct 18 2017, 4:09 PM

Closed by commit rHGe10bac797852: merge: additional test cases to show merge-halting behavior (authored by ryanmce). · Explain WhyOct 18 2017, 4:27 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-merge-halt.t (89 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2455		Oct 5 2017, 5:16 AM	★	★
Diff 2	2503		Oct 6 2017, 9:51 AM	★	★
Diff 3	2996	rHGe10bac7978523d75a3b5b862b3346119147a47d4	Oct 6 2017, 9:48 AM	★	★

Status	Author	Revision
Abandoned	ryanmce	D953 merge: use filemerge failure handler in post-filemerge checks checks
Closed	ryanmce	D952 merge: additional test cases to show merge-halting behavior
Closed	ryanmce	D951 merge: allow user to halt merge on merge-tool failures
Closed	ryanmce	D932 filemerge: introduce functions to halt merge flow
Closed	ryanmce	D931 merge: ensure that we always commit the mergestate
Closed	ryanmce	D930 merge: add tests to show current behavior on failed filemerges

Diff 2503

tests/test-merge-halt.t

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

	Testing on-failure=prompt			Testing on-failure=prompt
	$ echo on-failure=prompt >> $HGRCPATH			$ cat <<EOS >> $HGRCPATH
	$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false --config ui.interactive=1			> [merge]
				> on-failure=prompt
				> [ui]
				> interactive=1
				> EOS
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool false
	> y			> y
	> n			> n
	> EOS			> EOS
	rebasing 1:1f28a51c3c9b "c"			rebasing 1:1f28a51c3c9b "c"
	merging a			merging a
	merging b			merging b
	merging a failed!			merging a failed!
	continue merge operation (yn)? y			continue merge operation (yn)? y
	merging b failed!			merging b failed!
	continue merge operation (yn)? n			continue merge operation (yn)? n
	merge halted after failed merge (see hg resolve)			merge halted after failed merge (see hg resolve)
	[1]			[1]

	$ hg resolve --list			$ hg resolve --list
	U a			U a
	U b			U b

	$ hg rebase --abort			$ hg rebase --abort
	rebase aborted			rebase aborted

				Check that successful tool with failed post-check halts the merge
				$ cat <<EOS >> $HGRCPATH
				> [merge-tools]
				> true.check=changed
				> EOS
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true
				> y
				> n
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				output file a appears unchanged
				was merge successful (yn)? y
				output file b appears unchanged
				was merge successful (yn)? n
				merging b failed!
				continue merge operation (yn)? n
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				R a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that conflicts with conflict check also halts the merge
				$ cat <<EOS >> $HGRCPATH
				> [merge-tools]
				> true.check=conflicts
				> true.premerge=keep
				> [merge]
				> on-failure=halt
				> EOS
				$ hg rebase -s 1 -d 2 --tool true
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that always-prompt also can halt the merge
				$ cat <<EOS \| hg rebase -s 1 -d 2 --tool true --config merge-tools.true.check=prompt
				> y
				> n
				> EOS
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				was merge of 'a' successful (yn)? y
				was merge of 'b' successful (yn)? n
				merging b failed!
				merge halted after failed merge (see hg resolve)
				[1]

				$ hg resolve --list
				R a
				U b

				$ hg rebase --abort
				rebase aborted

				Check that successful tool otherwise allows the merge to continue
				$ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				$TESTTMP/repo/a a~base a~other (glob)
				$TESTTMP/repo/b b~base b~other (glob)