Revision 2f3b28f27234a0130583131a6785c44e3dd1cac4 authored by Johannes Schindelin on 09 March 2023, 22:08:47 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:37 UTC
The `maint-2.30` branch accumulated quite a few fixes over the past two years. Most of those fixes were originally based on newer versions, and while the patches cherry-picked cleanly, we weren't diligent enough to pay attention to the CI builds and the GETTEXT_POISON job regressed. This topic branch fixes that. * js/gettext-poison-fixes t0033: GETTEXT_POISON fix t0003: GETTEXT_POISON fix, part 1 t0003: GETTEXT_POISON fix, conclusion t5619: GETTEXT_POISON fix t5604: GETTEXT_POISON fix, part 1 t5604: GETTEXT_POISON fix, conclusion
t6425-merge-rename-delete.sh
#!/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.* renamed .*to B.* in rename" output &&
test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...