freshlybakedca.ke
Git fork
1#!/bin/sh
2
3test_description='Merge-recursive rename/delete conflict message'
4GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7. ./test-lib.sh
8
9test_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
18 git checkout main &&
19 git rm A &&
20 git commit -m "delete" &&
21
22 test_must_fail git merge --strategy=recursive rename >output &&
23 test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
24 test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
25'
26
27test_done