This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D6254 tests: avoid a rename/delete conflict when updating in test-narrow-update.t
Closed	martinvonz	D6253 tests: delete unused function in test-rename-merge2.t
Closed	martinvonz	D6252 tests: make merge conflicts explicit in `hg annotate` tests
Closed	martinvonz	D6251 copies: delete debug message about "unmatched files new in both"
Closed	martinvonz	D6250 copies: delete debug message about changes since common ancestor
Closed	martinvonz	D6249 copies: delete debug message about search limit
Closed	martinvonz	D6248 copies: move early return for "no copies" case a little earlier
Closed	martinvonz	D6247 copies: fix up "fullcopy" with missing entries from "diverge"
Closed	martinvonz	D6246 copies: fix up "fullcopy" with missing entries from "copy"
Closed	martinvonz	D6245 merge: remove workaround for issue5020
Closed	martinvonz	D6244 copies: don't include copies that are not in source in directory move
Closed	martinvonz	D6243 tests: split out separate test for issue5020
Closed	martinvonz	D6242 tests: add test for issue5343 (grafting with copies)

Diff 14781

	$ up() {			$ up() {
	> cp rev $1			> cp rev $1
	> hg add $1 2> /dev/null			> hg add $1 2> /dev/null
	> if [ "$2" != "" ] ; then			> if [ "$2" != "" ] ; then
	> cp rev $2			> cp rev $2
	> hg add $2 2> /dev/null			> hg add $2 2> /dev/null
	> fi			> fi
	> }			> }
	$ uc() { up $1; hg cp $1 $2; } # update + copy
	$ um() { up $1; hg mv $1 $2; }			$ um() { up $1; hg mv $1 $2; }
	$ nc() { hg cp $1 $2; } # just copy			$ nc() { hg cp $1 $2; } # just copy
	$ nm() { hg mv $1 $2; } # just move			$ nm() { hg mv $1 $2; } # just move
	$ tm "up a " "nc a b" " " "1 get local a to b"			$ tm "up a " "nc a b" " " "1 get local a to b"
	created new head			created new head
	--------------			--------------
	test L:up a R:nc a b W: - 1 get local a to b			test L:up a R:nc a b W: - 1 get local a to b
	--------------			--------------