File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 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
6969ifneq "$(shell cd $(CPYTHON_CLONE ) 2>/dev/null && git describe --contains --all HEAD) " "$(BRANCH ) "
7070 $(error "You're merging from a different branch")
7171endif
72+ (cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
7273 (cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
7374 find $(CPYTHON_CLONE)/pot/ -name '*.pot' |\
7475 while read -r POT;\
7778 mkdir -p "$$(dirname "$$PO")";\
7879 if [ -f "$$PO" ];\
7980 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\
8185 else\
8286 msgcat -o "$$PO" "$$POT";\
8387 fi\
You can’t perform that action at this time.
0 commit comments