This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D8932 commit: clear mergestate also with --amend (issue6304)
Closed	martinvonz	D8931 tests: add test showing that merge state is not cleared by amend
Abandoned	martinvonz	D8930 mergestate: clear merge state if there are no unresolved conflicts

Diff 22410

	$ hg amend -d "0 0"			$ hg amend -d "0 0"
	nothing changed			nothing changed
	[1]			[1]

	$ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"			$ hg amend -d "Thu Jan 01 00:00:00 1970 UTC"
	nothing changed			nothing changed
	[1]			[1]

				#if obsstore-on
				$ hg init repo-merge-state
				$ cd repo-merge-state
				$ echo a > f
				$ hg ci -Aqm a
				$ echo b > f
				$ hg ci -Aqm b
				$ echo c > f
				$ hg co -m '.^'
				merging f
				warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges
				[1]
				$ echo d > f
				$ hg resolve -m f
				(no more unresolved files)
				$ hg ci --amend --config experimental.evolution.allowunstable=True
				1 new orphan changesets
				$ hg resolve -l
				R f
				$ cd ..
				#endif

	Matcher and metadata options			Matcher and metadata options

	$ echo 3 > C			$ echo 3 > C
	$ echo 4 > D			$ echo 4 > D
	$ hg add C D			$ hg add C D
	$ hg amend -m NEWMESSAGE -I C			$ hg amend -m NEWMESSAGE -I C
	saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (obsstore-off !)			saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/be169c7e8dbe-7684ddc5-amend.hg (obsstore-off !)
	$ hg log -r . -T '{node\|short} {desc} {files}\n'			$ hg log -r . -T '{node\|short} {desc} {files}\n'