svn commit: r1914104 - /subversion/site/publish/upcoming.part.html

[svn-role]

Author: svn-role
Date: Sat Nov 25 04:15:01 2023
New Revision: 1914104

URL: http://svn.apache.org/viewvc?rev=1914104&view=rev
Log:
* upcoming.part.html: Automatically regenerated

Modified:
subversion/site/publish/upcoming.part.html

Modified: subversion/site/publish/upcoming.part.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/upcoming.part.html?rev=1914104&r1=1914103&r2=1914104&view=diff
==
--- subversion/site/publish/upcoming.part.html (original)
+++ subversion/site/publish/upcoming.part.html Sat Nov 25 04:15:01 2023
@@ -230,6 +230,18 @@ Merge the https://svn.apache.or
  +1: dsahlberg, jamessan
 
 
+https://svn.apache.org/r1914102";>r1914102 | svn-role | 2023-11-25 
04:00:03 + (Sat, 25 Nov 2023) | 9 lines
+
+Merge https://svn.apache.org/r1908926";>r1908926 from trunk:
+
+ * https://svn.apache.org/r1908926";>r1908926
+   libsvn_client: Pass redirected URL for file externals.
+   Justification:
+ Bug fix. Issue #4911.
+   Votes:
+ +1: dsahlberg, stsp, hartmannathan
+
+
 
 
 Further changes currently under consideration are listed in each release 
line's 

svn commit: r1914102 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_client/externals.c

[svn-role]

Author: svn-role
Date: Sat Nov 25 04:00:03 2023
New Revision: 1914102

URL: http://svn.apache.org/viewvc?rev=1914102&view=rev
Log:
Merge r1908926 from trunk:

 * r1908926
   libsvn_client: Pass redirected URL for file externals.
   Justification:
 Bug fix. Issue #4911.
   Votes:
 +1: dsahlberg, stsp, hartmannathan

Modified:
subversion/branches/1.14.x/   (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_client/externals.c

Propchange: subversion/branches/1.14.x/
--
  Merged /subversion/trunk:r1908926

Modified: subversion/branches/1.14.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1914102&r1=1914101&r2=1914102&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Nov 25 04:00:03 2023
@@ -35,10 +35,3 @@ Veto-blocked changes:
 
 Approved changes:
 =
-
- * r1908926
-   libsvn_client: Pass redirected URL for file externals.
-   Justification:
- Bug fix. Issue #4911.
-   Votes:
- +1: dsahlberg, stsp, hartmannathan

Modified: subversion/branches/1.14.x/subversion/libsvn_client/externals.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_client/externals.c?rev=1914102&r1=1914101&r2=1914102&view=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_client/externals.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_client/externals.c Sat Nov 25 
04:00:03 2023
@@ -917,7 +917,7 @@ handle_external_item_change(svn_client_c
 
 SVN_ERR(switch_file_external(local_abspath,
  new_loc,
- new_url,
+ new_loc->url,
  &new_item->peg_revision,
  &new_item->revision,
  parent_dir_abspath,