This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D12085 relnotes: add note about changed labels texts
Closed	martinvonz	D12025 graft: attempt to make merge labels more helpful
Closed	martinvonz	D12024 shelve: attempt to make merge labels more helpful
Closed	martinvonz	D12023 histedit: attempt to make merge labels more helpful
Closed	martinvonz	D12022 update: set custom conflict label for base commit
Closed	martinvonz	D12021 merge: set custom conflict label for base commit
Closed	martinvonz	D12020 rebase: set custom conflict label for base commit
Closed	martinvonz	D12019 simplemerge: take over formatting of label from `filemerge`
Closed	martinvonz	D12018 filemerge: pass `simplemerge.MergeInput` to tool functions
Closed	martinvonz	D12017 filemerge: work with `simplemerge.MergeInput` in `filemerge()`
Closed	martinvonz	D12016 filemerge: always define a "base" label
Closed	martinvonz	D12015 filemerge: set default labels a little earlier
Closed	martinvonz	D12014 filemerge: remove unused arguments from `_merge()`
Closed	martinvonz	D12013 simplemerge: take arguments as annotated context objects
Closed	martinvonz	D12012 filemerge: make `labels` a required arg for `_premerge()`
Closed	martinvonz	D12011 filemerge: remove unnecessary check for empty string
Closed	martinvonz	D12010 tests: also test spaces in conflict marker labels

Diff 31835

	replace your callers to use this new update(), or clean_update(), merge(),			replace your callers to use this new update(), or clean_update(), merge(),
	revert_to(), or graft().			revert_to(), or graft().
	"""			"""
	return _update(			return _update(
	ctx.repo(),			ctx.repo(),
	ctx.rev(),			ctx.rev(),
	branchmerge=False,			branchmerge=False,
	force=False,			force=False,
	labels=[b'working copy', b'destination'],			labels=[b'working copy', b'destination', b'working copy parent'],
	updatecheck=updatecheck,			updatecheck=updatecheck,
	wc=wc,			wc=wc,
	)			)


	def clean_update(ctx, wc=None):			def clean_update(ctx, wc=None):
	"""Do a clean update to the given commit.			"""Do a clean update to the given commit.

	use 'hg resolve' to retry unresolved file merges			use 'hg resolve' to retry unresolved file merges
	[1]			[1]
	$ cat a			$ cat a
	Small Mathematical Series.			Small Mathematical Series.
	1			1
	2			2
	3			3
	<<<<<<<			<<<<<<<
	------- base			------- working copy parent
	+++++++ working copy			+++++++ working copy
	4			4
	+4.5			+4.5
	5			5
	======= destination			======= destination
	6			6
	8			8
	>>>>>>>			>>>>>>>
	Small Mathematical Series.			Small Mathematical Series.
	1			1
	2			2
	<<<<<<<			<<<<<<<
	======= working copy			======= working copy
	3.5			3.5
	4.5			4.5
	5.5			5.5
	------- base			------- working copy parent
	+++++++ destination			+++++++ destination
	3			3
	-4			-4
	-5			-5
	+6			+6
	+8			+8
	>>>>>>>			>>>>>>>
	Hop we are done.			Hop we are done.

	? a.orig			? a.orig
	# Unresolved merge conflicts:			# Unresolved merge conflicts:
	#			#
	# a			# a
	#			#
	# To mark files as resolved: hg resolve --mark FILE			# To mark files as resolved: hg resolve --mark FILE

	$ cat a			$ cat a
	<<<<<<< working copy: 6efa171f091b - test: 3			<<<<<<< working copy: 6efa171f091b - test: 3
	three			three
	dirty			dirty
	\|\|\|\|\|\|\| base: 6efa171f091b - test: 3			\|\|\|\|\|\|\| working copy parent: 6efa171f091b - test: 3
	three			three
	=======			=======
	four			four
	>>>>>>> destination: d047485b3896 b1 - test: 4			>>>>>>> destination: d047485b3896 b1 - test: 4
	$ rm a.orig			$ rm a.orig

	$ echo 'update.check = noconflict' >> .hg/hgrc			$ echo 'update.check = noconflict' >> .hg/hgrc

	$ revtest 'none dirty cross' dirty 3 4			$ revtest 'none dirty cross' dirty 3 4
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	parent=4			parent=4
	M foo			M foo