[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-594-g6cda85465

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  6cda85465cd1c87907666435f228cc55c31c39b2 (commit)
      from  9fbaa53a5d9e5bd9fa0cb1ec2a68a54a49f5f9d4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6cda85465cd1c87907666435f228cc55c31c39b2
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 19 17:42:11 2023 +0200

    Avoid line-wrap war when updating the pot file
    
    Use msgmerge to not update strings that did not change

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4b718f645..93acd59cf 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -333,7 +333,10 @@ $(XML_UNIFIED_POT): $(XML_SOURCE_POTS)
       rm -f $@.tmp; \
     fi; \
   fi;
-	@if test -e $@.tmp; then mv $@.tmp $@; fi
+	@if test -e $@.tmp; then \
+		$(MSGMERGE) -U $@.tmp $@ || exit 1; \
+		rm $@.tmp; \
+	fi
 
 # Creates or updates translation files
 update-po: $(PO_FILES)

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS