This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D9390 errors: introduce SecurityError and use it in a few places
Closed	martinvonz	D9389 errors: raise InputError when too few arguments given to alias
Closed	martinvonz	D9388 errors: raise InputError on bad top-level flags
Closed	martinvonz	D9602 errors: raise InputError on recursive template definition
Closed	martinvonz	D9393 errors: raise StateError on uncommitted changes when merge starts
Closed	martinvonz	D9392 errors: raise StateError when there are unresolves merge conflicts
Closed	martinvonz	D9391 errors: raise StateError when push fails because it creates new heads
Closed	martinvonz	D9387 errors: raise InputError on early parse error in dispatch
Closed	martinvonz	D9386 errors: raise more specifc errors from narrowcommands
Closed	martinvonz	D9601 errors: use detailed exit code 50 for StorageError
Closed	martinvonz	D9600 errors: raise InputError if an ambiguous revision id prefix is used
Closed	martinvonz	D9599 localrepo: delete obsolete comment about `prefix in repo` raising exception

Diff 23677

	)			)
	elif pas == [p1]:			elif pas == [p1]:
	if not mergeancestor and wc.branch() == p2.branch():			if not mergeancestor and wc.branch() == p2.branch():
	raise error.Abort(			raise error.Abort(
	_(b"nothing to merge"),			_(b"nothing to merge"),
	hint=_(b"use 'hg update' or check 'hg heads'"),			hint=_(b"use 'hg update' or check 'hg heads'"),
	)			)
	if not force and (wc.files() or wc.deleted()):			if not force and (wc.files() or wc.deleted()):
	raise error.Abort(			raise error.StateError(
	_(b"uncommitted changes"),			_(b"uncommitted changes"),
	hint=_(b"use 'hg status' to list changes"),			hint=_(b"use 'hg status' to list changes"),
	)			)
	if not wc.isinmemory():			if not wc.isinmemory():
	for s in sorted(wc.substate):			for s in sorted(wc.substate):
	wc.sub(s).bailifchanged()			wc.sub(s).bailifchanged()

	elif not overwrite:			elif not overwrite:

	$ cat b			$ cat b
	This is file b1			This is file b1

	$ echo This is file b22 > b			$ echo This is file b22 > b
	merge fails			merge fails
	$ hg merge 2			$ hg merge 2
	abort: uncommitted changes			abort: uncommitted changes
	(use 'hg status' to list changes)			(use 'hg status' to list changes)
	[255]			[20]
	merge expected!			merge expected!
	$ hg merge -f 2			$ hg merge -f 2
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 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)
	$ hg diff --nodates			$ hg diff --nodates
	diff -r 85de557015a8 b			diff -r 85de557015a8 b
	--- a/b			--- a/b
	+++ b/b			+++ b/b
	$ hg add c			$ hg add c
	$ hg commit -m "commit #3"			$ hg commit -m "commit #3"
	created new head			created new head
	$ echo This is file b33 > b			$ echo This is file b33 > b
	merge of b should fail			merge of b should fail
	$ hg merge 2			$ hg merge 2
	abort: uncommitted changes			abort: uncommitted changes
	(use 'hg status' to list changes)			(use 'hg status' to list changes)
	[255]			[20]
	merge of b expected			merge of b expected
	$ hg merge -f 2			$ hg merge -f 2
	merging b			merging b
	merging for b			merging for b
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved			0 files updated, 1 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg diff --nodates			$ hg diff --nodates
	diff -r 85de557015a8 b			diff -r 85de557015a8 b