This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	mitrandir	D45 tests: add devel-warning to remotenames output
Closed	mitrandir	D44 tests: one new temaplate in the tests message
Closed	mitrandir	D43 tests: add messages about new obsoleted changestes
Closed	mitrandir	D42 tests: remove transaction aborts
Closed	mitrandir	D41 tests: adjust for new messages coming from the strip transaction
Closed	mitrandir	D40 tests: change the name of backup files
Closed	mitrandir	D39 tests: remove the warning about conflicting configs

Diff 58

	\|			\|
	o (0) base			o (0) base
	affected: file			affected: file
	deleted:			deleted:


	$ hg rebase -d 2 -s 1			$ hg rebase -d 2 -s 1
	rebasing 1:ed93aeac6b3c "source"			rebasing 1:ed93aeac6b3c "source"
	transaction abort!
	rollback completed
	abort: Not a directory: '$TESTTMP/cornercases/foo/foo/foo/foo/file/subfile'			abort: Not a directory: '$TESTTMP/cornercases/foo/foo/foo/foo/file/subfile'
	[255]			[255]
	$ hg resolve --tool=internal:dumpjson --all			$ hg resolve --tool=internal:dumpjson --all
	[			[
	{			{
	"command": "update",			"command": "update",
	"conflicts": []			"conflicts": []
	}			}
	\|			\|
	o (0) base			o (0) base
	affected: file			affected: file
	deleted:			deleted:


	$ hg rebase -d 2 -s 1			$ hg rebase -d 2 -s 1
	rebasing 1:ec87889f5f90 "source"			rebasing 1:ec87889f5f90 "source"
	transaction abort!
	rollback completed
	abort: (Is a directory\|Operation not permitted): '\$TESTTMP/cornercases/foo/foo/foo/foo/file' (re)			abort: (Is a directory\|Operation not permitted): '\$TESTTMP/cornercases/foo/foo/foo/foo/file' (re)
	[255]			[255]
	$ hg resolve --tool=internal:dumpjson --all			$ hg resolve --tool=internal:dumpjson --all
	[			[
	{			{
	"command": "update",			"command": "update",
	"conflicts": []			"conflicts": []
	}			}

	$ hg rebase --abort -q			$ hg rebase --abort -q
	rebase aborted			rebase aborted
	$ hg status			$ hg status
	? a.orig			? a.orig
	$ rm a.orig			$ rm a.orig

	Test rebase with an interrupted update:			Test rebase with an interrupted update:
	$ hg $breakupdateflag rebase -s 2977a57ce863 -d 79361b8cdbb5 -q			$ hg $breakupdateflag rebase -s 2977a57ce863 -d 79361b8cdbb5 -q
	transaction abort!
	rollback completed
	$ hg status			$ hg status

	# The repository is in an unfinished rebase state.			# The repository is in an unfinished rebase state.
	# To continue: hg rebase --continue			# To continue: hg rebase --continue
	# To abort: hg rebase --abort			# To abort: hg rebase --abort
	$ hg rebase --abort -q			$ hg rebase --abort -q
	rebase aborted			rebase aborted

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	58			Jul 11 2017, 12:12 PM	★	★