Author: dsahlberg
Date: Tue Aug 29 19:55:03 2023
New Revision: 1912002
URL: http://svn.apache.org/viewvc?rev=1912002&view=rev
Log:
Fix issue #4621
The svn command line client version 1.9 and later will return
an error on propget if the property doesn't exist.
* contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
Check for the property existence using proplist before trying
to get the property
Patch by: Vivek Khera (newline fixes by me, removed part
already fixed in r1863392)
Modified:
subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
Modified: subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in?rev=1912002&r1=1912001&r2=1912002&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
(original)
+++ subversion/trunk/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Tue
Aug 29 19:55:03 2023
@@ -1239,6 +1239,15 @@ while (defined (my $load_dir = &get_next
# get the incorrect information. So always append @BASE
# and any preceding @'s will be treated normally and the
# correct information will be retrieved.
+
+ # first make sure that the file has the eol-style property
+ # else svn 1.9 will error when it is not found
+ my @proplist = read_from_process($svn,
+ 'proplist',
+ '--quiet',
+ "$upd_file\@BASE");
+ next unless grep(/svn:eol-style/, @proplist);
+
my @command = ($svn,
'propget',
'svn:eol-style',
