This is an archive of the discontinued Mercurial Phabricator instance.

merge: add tests to show current behavior on failed filemerges
ClosedPublic

Authored by ryanmce on Oct 4 2017, 9:54 AM.

Download Raw Diff

Details

Reviewers

quark
durin42

Group Reviewers

hg-reviewers

Commits

rHG143337bcec9b: merge: add tests to show current behavior on failed filemerges

Summary

Currently, failed file merges will nevertheless force the user to continue
attempting to merge all additional unresolved files. Future patches will allow
the user to halt the merge process instead. This patch first introduces a test
demonstrating the current bejhavior so the upcoming changes are more obvious.

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

ryanmce created this revision.Oct 4 2017, 9:54 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 4 2017, 9:54 AM

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

ryanmce added a child revision: D931: merge: ensure that we always commit the mergestate.Oct 4 2017, 9:55 AM

krbullock added a subscriber: krbullock.Oct 4 2017, 3:08 PM

krbullock added inline comments.

tests/test-merge-halt.t
25	Why test this with rebase instead of merge?

ryanmce added inline comments.Oct 5 2017, 5:20 AM

tests/test-merge-halt.t
25	That's how I roll. That being said, I'm happy to change it if people feel testing merge would provide more value.

quark added a subscriber: quark.Oct 6 2017, 12:51 AM

quark added inline comments.

tests/test-merge-halt.t
33	Should we have an `hg resolve -l` here?
37	It feels a bit strange that the text says "works". Maybe use some neutral words like "Testing onfailure=continue", "Testing onfailure=halt", and "Testing onfailure=halt".

ryanmce added inline comments.Oct 6 2017, 6:48 AM

tests/test-merge-halt.t
33	sounds good
37	I like the suggestion. Will follow.

ryanmce marked 4 inline comments as done.Oct 6 2017, 9:17 AM

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

It seems this revision is not associated with HG callsign somehow. I've added it manually.

I guess you missed phabricator.callsign = HG in .hg/hgrc.

I guess you missed phabricator.callsign = HG in .hg/hgrc.

Yes, that's the case. I've fixed that in my repo.

durin42 accepted this revision.Oct 14 2017, 12:29 AM

This revision is now accepted and ready to land.Oct 14 2017, 12:29 AM

Closed by commit rHG143337bcec9b: merge: add tests to show current behavior on failed filemerges (authored by ryanmce). · Explain WhyOct 14 2017, 12:55 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2411		Oct 4 2017, 9:54 AM	★	★
Diff 2	2499		Oct 6 2017, 9:51 AM	★	★
Diff 3	2712	rHG143337bcec9b387d1cd81d5036cf871abf768055	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 2712

tests/test-merge-halt.t

This file was added.

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				> [phases]
				> publish=False
				> [merge]
				> EOF

				$ hg init repo
				$ cd repo
				$ echo a > a
				$ echo b > b
				$ hg commit -qAm ab
				$ echo c >> a
				$ echo c >> b
				$ hg commit -qAm c
				$ hg up -q ".^"
				$ echo d >> a
				$ echo d >> b
				$ hg commit -qAm d

				Testing on-failure=continue
				$ echo on-failure=continue >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				krbullockUnsubmitted Not Done Why test this with rebase instead of merge? krbullock: Why test this with rebase instead of merge?
				ryanmceAuthorUnsubmitted Not Done That's how I roll. That being said, I'm happy to change it if people feel testing merge would provide more value. ryanmce: That's how I roll. That being said, I'm happy to change it if people feel testing merge would…
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				quarkUnsubmitted Done Should we have an `hg resolve -l` here? quark: Should we have an `hg resolve -l` here?
				ryanmceAuthorUnsubmitted Done sounds good ryanmce: sounds good
				U a
				U b

				$ hg rebase --abort
				quarkUnsubmitted Done It feels a bit strange that the text says "works". Maybe use some neutral words like "Testing onfailure=continue", "Testing onfailure=halt", and "Testing onfailure=halt". quark: It feels a bit strange that the text says "works". Maybe use some neutral words like "Testing…
				ryanmceAuthorUnsubmitted Done I like the suggestion. Will follow. ryanmce: I like the suggestion. Will follow.
				rebase aborted

				Testing on-failure=halt
				$ echo on-failure=halt >> $HGRCPATH
				$ hg rebase -s 1 -d 2 --tool false
				rebasing 1:1f28a51c3c9b "c"
				merging a
				merging b
				merging a failed!
				merging b failed!
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted

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

				$ hg resolve --list
				U a
				U b

				$ hg rebase --abort
				rebase aborted