This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D8986 debugmergestate: sort extras before printing
Closed	pulkit	D8985 commit: fix a wrong argument name in documentation
Closed	pulkit	D8984 commit: pass mergestate into _filecommit() instead of re-reading it
Closed	pulkit	D9003 merge: store cases when a file is absent post merge in commitinfo
Closed	pulkit	D9029 tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
Closed	pulkit	D8989 commit: force create a new filenode if it was set in mergestate by merge
Closed	pulkit	D8988 merge: store commitinfo if mergetool resolved a dc or cd conflict
Closed	pulkit	D9028 tests: add some debugmergestate calls in `test-merge-criss-cross.t`
Closed	pulkit	D8987 tests: add few debugrevlogindex and a log call to see changes in next test
Closed	pulkit	D9027 merge: check new filenode creation config before disabling optimization
Changes Planned	pulkit	D8982 merge: disable `m2-vs-ma` diff optimization in case of flat manifests
Closed	pulkit	D8981 scmutil: introduce function to check whether repo uses treemanifest or not
Closed	pulkit	D9026 configitems: add a new config option to control new filenode functionality
Closed	pulkit	D9025 mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
Closed	pulkit	D9002 mergestate: introduce a new ACTION_KEEP_NEW
Changes Planned	pulkit	D8977 merge: check for dir rename dest before adding ACTION_KEEP
Closed	pulkit	D8983 merge: move initial handling of mergeactions near to later one

Diff 22875

tests/test-merge-criss-cross.t


	$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'			$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg merge 'desc("merge-deleting-the-file-from-updated")'			$ hg merge 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
				$ hg debugmergestate
				no merge state found

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'			$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-keeping-the-file-from-deleted")'			$ hg merge 'desc("merge-keeping-the-file-from-deleted")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file (newfilenode !)			the-file (newfilenode !)

				#if newfilenode
				$ hg debugmergestate
				local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f
				other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
				extra: the-file (merge-removal-candidate = yes)
				#else
				$ hg debugmergestate
				no merge state found
				#endif

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'			$ hg update --clean 'desc("merge-deleting-the-file-from-deleted")'
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved (newfilenode !)			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-keeping-the-file-from-updated")'			$ hg merge 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
				$ hg debugmergestate
				no merge state found

	(merging two deletion together → no conflict)			(merging two deletion together → no conflict)

	$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'			$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-deleting-the-file-from-deleted")'			$ hg merge 'desc("merge-deleting-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
				$ hg debugmergestate
				no merge state found

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'			$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-keeping-the-file-from-deleted")'			$ hg merge 'desc("merge-keeping-the-file-from-deleted")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file (newfilenode !)			the-file (newfilenode !)
				#if newfilenode
				$ hg debugmergestate
				local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e
				other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
				extra: the-file (merge-removal-candidate = yes)
				#else
				$ hg debugmergestate
				no merge state found
				#endif

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'			$ hg update --clean 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved (newfilenode !)			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-keeping-the-file-from-updated")'			$ hg merge 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
				$ hg debugmergestate
				no merge state found

	(merging two "keeping" together → no conflict)			(merging two "keeping" together → no conflict)

	$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'			$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-keeping-the-file-from-deleted")'			$ hg merge 'desc("merge-keeping-the-file-from-deleted")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file
				#if newfilenode
				$ hg debugmergestate
				local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c
				other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
				extra: the-file (filenode-source = other)
				#else
				$ hg debugmergestate
				no merge state found
				#endif

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'			$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-deleted-the-file-from-deleted")'			$ hg merge 'desc("merge-deleted-the-file-from-deleted")'
	abort: empty revision set			abort: empty revision set
	[255]			[255]
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file
				$ hg debugmergestate
				no merge state found

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'			$ hg update --clean 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-deleting-the-file-from-updated")'			$ hg merge 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file
				$ hg debugmergestate
				no merge state found

	(merging two "keeping" together → no conflict)			(merging two "keeping" together → no conflict)

	$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'			$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (newfilenode !)
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)			0 files updated, 0 files merged, 0 files removed, 0 files unresolved (old !)
	$ hg merge 'desc("merge-keeping-the-file-from-updated")'			$ hg merge 'desc("merge-keeping-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file
				$ hg debugmergestate
				no merge state found

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'			$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-deleted-the-file-from-deleted")'			$ hg merge 'desc("merge-deleted-the-file-from-deleted")'
	abort: empty revision set			abort: empty revision set
	[255]			[255]
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file
				$ hg debugmergestate
				no merge state found

	(merging a deletion with keeping → conflict)			(merging a deletion with keeping → conflict)
	BROKEN: this should result in conflict			BROKEN: this should result in conflict

	$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'			$ hg update --clean 'desc("merge-keeping-the-file-from-deleted")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("merge-deleting-the-file-from-updated")'			$ hg merge 'desc("merge-deleting-the-file-from-updated")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ ls -1			$ ls -1
	other-file			other-file
	the-file			the-file
				#if newfilenode
				$ hg debugmergestate
				local (working copy): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78
				other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e
				extra: the-file (merge-removal-candidate = yes)
				#else
				$ hg debugmergestate
				no merge state found
				#endif

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22674		Sep 17 2020, 5:50 AM	★	★
Diff 2	22875	rHG8c02c6262a5ea25923455334040556be03881260	Sep 14 2020, 5:38 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

tests: add some more debugmergestate calls in `test-merge-criss-cross.t`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 22875

tests/test-merge-criss-cross.t

tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
ClosedPublic

Revision Contents
Changeset List