You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
534 B
24 lines
534 B
8 years ago
|
#!/bin/sh
|
||
|
|
|
||
|
|
test_description='Merge-recursive rename/delete conflict message'
|
||
|
|
. ./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 master &&
|
||
|
|
git rm A &&
|
||
|
|
git commit -m "delete" &&
|
||
|
|
|
||
|
|
test_must_fail git merge --strategy=recursive rename >output &&
|
||
|
|
test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
|
||
|
|
'
|
||
|
|
|
||
|
|
test_done
|