File tree 1 file changed +5
-1
lines changed
1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -69,6 +69,7 @@ merge: $(VENV)/bin/sphinx-build
69
69
ifneq "$(shell cd $(CPYTHON_CLONE ) 2>/dev/null && git describe --contains --all HEAD) " "$(BRANCH ) "
70
70
$(error "You're merging from a different branch")
71
71
endif
72
+ (cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
72
73
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
73
74
find $(CPYTHON_CLONE)/pot/ -name '*.pot' |\
74
75
while read -r POT;\
77
78
mkdir -p "$$(dirname "$$PO")";\
78
79
if [ -f "$$PO" ];\
79
80
then\
80
- msgmerge --backup=off --force-po -U "$$PO" "$$POT";\
81
+ case "$$POT" in\
82
+ *whatsnew*) msgmerge --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\
83
+ *) msgmerge --backup=off --force-po -U "$$PO" "$$POT" ;;\
84
+ esac\
81
85
else\
82
86
msgcat -o "$$PO" "$$POT";\
83
87
fi\
You can’t perform that action at this time.
0 commit comments