[thirdparty/git.git] / t / t6425-merge-rename-delete.sh

#!/bin/sh

test_description='Merge-recursive rename/delete conflict message'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./test-lib.sh

test_expect_success 'rename/delete' '
	echo foo >A &&
	git add A &&
	git commit -m "initial" &&

	git checkout -b rename &&
	git mv A B &&
	git commit -m "rename" &&

	git checkout main &&
	git rm A &&
	git commit -m "delete" &&

	test_must_fail git merge --strategy=recursive rename >output &&
	test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
	test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
'

test_done
Commit	Line	Data
b26d87f2 MM	1	#!/bin/sh
	2
	3	test_description='Merge-recursive rename/delete conflict message'
5902f5f4	4	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
334afbc7 JS	5	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
334afbc7 JS	6
b26d87f2 MM	7	. ./test-lib.sh
	8
	9	test_expect_success 'rename/delete' '
	10	echo foo >A &&
	11	git add A &&
	12	git commit -m "initial" &&
	13
	14	git checkout -b rename &&
	15	git mv A B &&
	16	git commit -m "rename" &&
	17
5902f5f4	18	git checkout main &&
b26d87f2 MM	19	git rm A &&
	20	git commit -m "delete" &&
	21
	22	test_must_fail git merge --strategy=recursive rename >output &&
1f3c9ba7 EN	23	test_i18ngrep "CONFLICT (rename/delete): A.* renamed .to B. in rename" output &&
1f3c9ba7 EN	24	test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
b26d87f2 MM	25	'
	26
	27	test_done