This is an archive of the discontinued Mercurial Phabricator instance.

	\|/ c			\|/ c
	\|			\|
	o 1:d2ae7f538514 test			o 1:d2ae7f538514 test
	\| b			\| b
	\|			\|
	o 0:cb9a9f314b8b test			o 0:cb9a9f314b8b test
	a			a

	#if execbit

	Test a metadata-only in-memory merge			Test a metadata-only in-memory merge
	$ cd $TESTTMP			$ cd $TESTTMP
	$ hg init no_exception			$ hg init no_exception
	$ cd no_exception			$ cd no_exception
	# Produce the following graph:			# Produce the following graph:
	# o 'add +x to foo.txt'			# o 'add +x to foo.txt'
	# \| o r1 (adds bar.txt, just for something to rebase to)			# \| o r1 (adds bar.txt, just for something to rebase to)
	# \|/			# \|/
	# o r0 (adds foo.txt, no +x)			# o r0 (adds foo.txt, no +x)
	$ echo hi > foo.txt			$ echo hi > foo.txt
	$ hg ci -qAm r0			$ hg ci -qAm r0
	$ echo hi > bar.txt			$ echo hi > bar.txt
	$ hg ci -qAm r1			$ hg ci -qAm r1
	$ hg co -qr ".^"			$ hg co -qr ".^"
	$ chmod +x foo.txt			$ chmod +x foo.txt
	$ hg ci -qAm 'add +x to foo.txt'			$ hg ci -qAm 'add +x to foo.txt'
	issue5960: this was raising an AttributeError exception			issue5960: this was raising an AttributeError exception
	$ hg rebase -r . -d 1			$ hg rebase -r . -d 1
	rebasing 2:539b93e77479 "add +x to foo.txt" (tip)			rebasing 2:539b93e77479 "add +x to foo.txt" (tip)
	saved backup bundle to $TESTTMP/no_exception/.hg/strip-backup/*.hg (glob)			saved backup bundle to $TESTTMP/no_exception/.hg/strip-backup/*.hg (glob)
	$ hg diff -c tip			$ hg diff -c tip
	diff --git a/foo.txt b/foo.txt			diff --git a/foo.txt b/foo.txt
	old mode 100644			old mode 100644
	new mode 100755			new mode 100755

	#endif

tests: drop redundant "#if execbit" from test-rebase-inmemory.tClosedPublic