Re: svn commit: r1899373 - /subversion/branches/1.14.x/STATUS
So.. backports failed today as well. After some digging I realised backport.pl didn't pick up the branch in this nomination due to a whitespace issue in STATUS. I removed one space character on each line and the backport worked. However one backport remains in STATUS: svnsvn@svn-qavm1:~/src/svn/1.14.x$ for i in ~/src/svn/1.*.x; do cd $i && $SVN up -q --non-interactive && YES=1 MAY_COMMIT=1 ../trunk/tools/dist/ backport.pl; done Warning summary === 1.14.x-r1881534-no-crlf (Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"): Revisions 'r1881534' nominated but not included in branch svnsvn@svn-qavm1:~/src/svn/1.14.x$ Can someone check it? I'm ENOTIME to dig into it. Kind regards, Daniel Den ons 30 mars 2022 kl 07:41 skrev : > Author: dsahlberg > Date: Wed Mar 30 05:41:19 2022 > New Revision: 1899373 > > URL: http://svn.apache.org/viewvc?rev=1899373=rev > Log: > * STATUS: Adjust whitespace to see if it resolves backport issues > > Modified: > subversion/branches/1.14.x/STATUS > > Modified: subversion/branches/1.14.x/STATUS > URL: > http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899373=1899372=1899373=diff > > == > --- subversion/branches/1.14.x/STATUS (original) > +++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:41:19 2022 > @@ -46,13 +46,13 @@ Approved changes: > = > > * r1899227 > -Don't show unreadable copyfrom paths in 'svn log -v' > -Justification: > - Makes 'svn log -v' consistent with spec. > -Branch: > - 1.14.x-r1899227 > -Votes: > - +1: hartmannathan, dsahlberg, rhuijben > + Don't show unreadable copyfrom paths in 'svn log -v' > + Justification: > + Makes 'svn log -v' consistent with spec. > + Branch: > + 1.14.x-r1899227 > + Votes: > + +1: hartmannathan, dsahlberg, rhuijben > > * r1898633 > Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure > > >
svn commit: r1899378 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Mar 30 05:46:00 2022 New Revision: 1899378 URL: http://svn.apache.org/viewvc?rev=1899378=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=1899378=1899377=1899378=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Mar 30 05:46:00 2022 @@ -157,6 +157,47 @@ Merge https://svn.apache.org/r1 +1: brane, jun66j5, markphip +https://svn.apache.org/r1899374;>r1899374 | svn-role | 2022-03-30 05:41:48 + (Wed, 30 Mar 2022) | 11 lines + +Merge the 1.14.x-https://svn.apache.org/r1899227;>r1899227 branch: + + * https://svn.apache.org/r1899227;>r1899227 + Dont show unreadable copyfrom paths in svn log -v + Justification: + Makes svn log -v consistent with spec. + Branch: + 1.14.x-https://svn.apache.org/r1899227;>r1899227 + Votes: + +1: hartmannathan, dsahlberg, rhuijben + + +https://svn.apache.org/r1899376;>r1899376 | svn-role | 2022-03-30 05:42:05 + (Wed, 30 Mar 2022) | 9 lines + +Merge https://svn.apache.org/r1898633;>r1898633 from trunk: + + * https://svn.apache.org/r1898633;>r1898633 + Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure + Justification: + Fix test failure + Votes: + +1: jamessan, stsp + + +https://svn.apache.org/r1899377;>r1899377 | svn-role | 2022-03-30 05:42:07 + (Wed, 30 Mar 2022) | 12 lines + +Merge the https://svn.apache.org/r1892470;>r1892470 group from trunk: + + * https://svn.apache.org/r1892470;>r1892470, https://svn.apache.org/r1892471;>r1892471, https://svn.apache.org/r1892541;>r1892541 + Fix an assertion failure triggered by the conflict resolver. + Justification: + Subversion should not crash. User complained. + Votes: + +1: stsp, markphip, rhuijben + +0: dsahlberg (test suite passes for check, davautocheck and + svnserveautocheck. Not enough C experience for a formal + review) + + Further changes currently under consideration are listed in each release line's
svn commit: r1899373 - /subversion/branches/1.14.x/STATUS
Author: dsahlberg Date: Wed Mar 30 05:41:19 2022 New Revision: 1899373 URL: http://svn.apache.org/viewvc?rev=1899373=rev Log: * STATUS: Adjust whitespace to see if it resolves backport issues Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899373=1899372=1899373=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:41:19 2022 @@ -46,13 +46,13 @@ Approved changes: = * r1899227 -Don't show unreadable copyfrom paths in 'svn log -v' -Justification: - Makes 'svn log -v' consistent with spec. -Branch: - 1.14.x-r1899227 -Votes: - +1: hartmannathan, dsahlberg, rhuijben + Don't show unreadable copyfrom paths in 'svn log -v' + Justification: + Makes 'svn log -v' consistent with spec. + Branch: + 1.14.x-r1899227 + Votes: + +1: hartmannathan, dsahlberg, rhuijben * r1898633 Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
svn commit: r1899376 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Author: svn-role
Date: Wed Mar 30 05:42:05 2022
New Revision: 1899376
URL: http://svn.apache.org/viewvc?rev=1899376=rev
Log:
Merge r1898633 from trunk:
* r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:
Fix test failure
Votes:
+1: jamessan, stsp
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1898633
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899376=1899375=1899376=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:42:05 2022
@@ -45,13 +45,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1898633
- Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
- Justification:
- Fix test failure
- Votes:
- +1: jamessan, stsp
-
* r1881534
Fix issue #4864 "build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE"
Justification:
Modified:
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1899376=1899375=1899376=diff
==
---
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/1.14.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Wed Mar 30 05:42:05 2022
@@ -4676,7 +4676,20 @@ public class BasicTests extends SVNTests
// RuntimeException("Test exception") is expected here
}
-tunnelAgent.joinAndTest();
+// In this test, there is a race condition that sometimes results in
+// IOException when 'WAIT_TUNNEL' tries to read from a pipe that
+// already has its read end closed. This is not an error, but
+// it's hard to distinguish this case from other IOException which
+// indicate a problem. To reproduce, simply wrap this test's body in
+// a loop. The workaround is to ignore any detected IOException.
+try
+{
+tunnelAgent.join();
+}
+catch (InterruptedException e)
+{
+e.printStackTrace();
+}
}
/**
svn commit: r1899377 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_client/conflicts.c subversion/libsvn_wc/wc_db.c subversion/tests/cmdline/merge_tree_conflict_tests.py
Author: svn-role
Date: Wed Mar 30 05:42:07 2022
New Revision: 1899377
URL: http://svn.apache.org/viewvc?rev=1899377=rev
Log:
Merge the r1892470 group from trunk:
* r1892470, r1892471, r1892541
Fix an assertion failure triggered by the conflict resolver.
Justification:
Subversion should not crash. User complained.
Votes:
+1: stsp, markphip, rhuijben
+0: dsahlberg (test suite passes for 'check', 'davautocheck' and
'svnserveautocheck'. Not enough C experience for a formal
review)
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c
subversion/branches/1.14.x/subversion/libsvn_wc/wc_db.c
subversion/branches/1.14.x/subversion/tests/cmdline/merge_tree_conflict_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1892470-1892471,1892541
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899377=1899376=1899377=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:42:07 2022
@@ -56,13 +56,3 @@ Approved changes:
1.14.x-r1881534-no-crlf
Votes:
+1: hartmannathan, stsp, markphip
-
- * r1892470, r1892471, r1892541
- Fix an assertion failure triggered by the conflict resolver.
- Justification:
- Subversion should not crash. User complained.
- Votes:
- +1: stsp, markphip, rhuijben
- +0: dsahlberg (test suite passes for 'check', 'davautocheck' and
- 'svnserveautocheck'. Not enough C experience for a formal
- review)
Modified: subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c?rev=1899377=1899376=1899377=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_client/conflicts.c Wed Mar 30
05:42:07 2022
@@ -3014,12 +3014,12 @@ conflict_tree_get_details_local_missing(
deleted_basename,
conflict->pool);
details->moves = moves;
+ details->wc_move_targets = apr_hash_make(conflict->pool);
if (details->moves != NULL)
{
apr_pool_t *iterpool;
int i;
- details->wc_move_targets = apr_hash_make(conflict->pool);
iterpool = svn_pool_create(scratch_pool);
for (i = 0; i < details->moves->nelts; i++)
{
@@ -8583,13 +8583,20 @@ resolve_incoming_move_file_text_merge(sv
* Merge from the local move's target location to the
* incoming move's target location. */
struct conflict_tree_local_missing_details *local_details;
- apr_array_header_t *moves;
local_details = conflict->tree_conflict_local_details;
- moves = svn_hash_gets(local_details->wc_move_targets,
-local_details->move_target_repos_relpath);
- merge_source_abspath =
-APR_ARRAY_IDX(moves, local_details->wc_move_target_idx, const char *);
+ if (local_details->wc_move_targets &&
+ local_details->move_target_repos_relpath)
+{
+ apr_array_header_t *moves;
+ moves = svn_hash_gets(local_details->wc_move_targets,
+local_details->move_target_repos_relpath);
+ merge_source_abspath =
+APR_ARRAY_IDX(moves, local_details->wc_move_target_idx,
+const char *);
+}
+ else
+merge_source_abspath = victim_abspath;
}
else
merge_source_abspath = victim_abspath;
@@ -9769,7 +9776,7 @@ resolve_local_move_dir_merge(svn_client_
NULL, conflict, scratch_pool,
scratch_pool));
- if (details->wc_move_targets)
+ if (details->wc_move_targets && details->move_target_repos_relpath)
{
apr_array_header_t *moves;
@@ -10718,7 +10725,8 @@ describe_incoming_move_merge_conflict_op
struct conflict_tree_incoming_delete_details *details;
details = conflict->tree_conflict_incoming_details;
- if (details->wc_move_targets)
+ if (details->wc_move_targets &&
+ details->move_target_repos_relpath)
{
apr_array_header_t *moves;
@@ -12251,7 +12259,7 @@ svn_client_conflict_option_get_moved_to_
*possible_moved_to_abspaths = apr_array_make(result_pool, 1,
sizeof (const char *));
- if (details->wc_move_targets)
+ if (details->wc_move_targets && details->move_target_repos_relpath)
{
svn commit: r1899374 - in /subversion/branches/1.14.x: ./ STATUS subversion/libsvn_repos/log.c subversion/tests/cmdline/authz_tests.py
Author: svn-role
Date: Wed Mar 30 05:41:48 2022
New Revision: 1899374
URL: http://svn.apache.org/viewvc?rev=1899374=rev
Log:
Merge the 1.14.x-r1899227 branch:
* r1899227
Don't show unreadable copyfrom paths in 'svn log -v'
Justification:
Makes 'svn log -v' consistent with spec.
Branch:
1.14.x-r1899227
Votes:
+1: hartmannathan, dsahlberg, rhuijben
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_repos/log.c
subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1899227
Merged /subversion/branches/1.14.x-r1899227:r1899228-1899373
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899374=1899373=1899374=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Mar 30 05:41:48 2022
@@ -45,15 +45,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1899227
- Don't show unreadable copyfrom paths in 'svn log -v'
- Justification:
- Makes 'svn log -v' consistent with spec.
- Branch:
- 1.14.x-r1899227
- Votes:
- +1: hartmannathan, dsahlberg, rhuijben
-
* r1898633
Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_repos/log.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_repos/log.c?rev=1899374=1899373=1899374=diff
==
--- subversion/branches/1.14.x/subversion/libsvn_repos/log.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_repos/log.c Wed Mar 30
05:41:48 2022
@@ -337,42 +337,36 @@ detect_changed(svn_repos_revision_access
if ( (change->change_kind == svn_fs_path_change_add)
|| (change->change_kind == svn_fs_path_change_replace))
{
- const char *copyfrom_path = change->copyfrom_path;
- svn_revnum_t copyfrom_rev = change->copyfrom_rev;
-
/* the following is a potentially expensive operation since on FSFS
we will follow the DAG from ROOT to PATH and that requires
actually reading the directories along the way. */
if (!change->copyfrom_known)
{
- SVN_ERR(svn_fs_copied_from(_rev, _path,
+ SVN_ERR(svn_fs_copied_from(>copyfrom_rev,
>copyfrom_path,
root, path, iterpool));
change->copyfrom_known = TRUE;
}
- if (copyfrom_path && SVN_IS_VALID_REVNUM(copyfrom_rev))
+ if (change->copyfrom_path &&
SVN_IS_VALID_REVNUM(change->copyfrom_rev))
{
- svn_boolean_t readable = TRUE;
-
if (callbacks->authz_read_func)
{
svn_fs_root_t *copyfrom_root;
+ svn_boolean_t readable;
SVN_ERR(svn_fs_revision_root(_root, fs,
- copyfrom_rev, iterpool));
+ change->copyfrom_rev,
iterpool));
SVN_ERR(callbacks->authz_read_func(,
copyfrom_root,
- copyfrom_path,
+ change->copyfrom_path,
callbacks->authz_read_baton,
iterpool));
if (! readable)
-found_unreadable = TRUE;
-}
-
- if (readable)
-{
- change->copyfrom_path = copyfrom_path;
- change->copyfrom_rev = copyfrom_rev;
+{
+ found_unreadable = TRUE;
+ change->copyfrom_path = NULL;
+ change->copyfrom_rev = SVN_INVALID_REVNUM;
+}
}
}
}
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py?rev=1899374=1899373=1899374=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py
(original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/authz_tests.py Wed Mar
30 05:41:48 2022
@@ -1731,6 +1731,60 @@ def empty_group(sbox):
'--username',
svn commit: r1899375 - /subversion/branches/1.14.x-r1899227/
Author: svn-role Date: Wed Mar 30 05:42:03 2022 New Revision: 1899375 URL: http://svn.apache.org/viewvc?rev=1899375=rev Log: Remove the '1.14.x-r1899227' branch, merged in r1899374. Removed: subversion/branches/1.14.x-r1899227/
svn commit: r1899366 - /subversion/branches/1.14.x/STATUS
Author: jun66j5 Date: Tue Mar 29 21:40:41 2022 New Revision: 1899366 URL: http://svn.apache.org/viewvc?rev=1899366=rev Log: * STATUS: Cancel nomination r1897441 (no need for 1.14.x) Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899366=1899365=1899366=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Tue Mar 29 21:40:41 2022 @@ -42,14 +42,6 @@ Candidate changes: Veto-blocked changes: = - * r1897441 - swig-py: Fix cleanup failing in unit tests with Python 3 on Windows. - Justification: - Make check-swig-py passed. - Votes: - +1: jun66j5, markphip - -1: dsahlberg (doesn't apply cleanly, +0 once fixed) - Approved changes: =
svn commit: r1899365 - in /subversion/site/publish: ./ docs/community-guide/releasing.part.html docs/release-notes/index.html faq.html roadmap.html
Author: dsahlberg Date: Tue Mar 29 21:13:26 2022 New Revision: 1899365 URL: http://svn.apache.org/viewvc?rev=1899365=rev Log: In site/publish: Merge 1898975-1898976,1899267-1899268,1899328 from staging: * faq.html: Spelling error * roadmap.html: Hide outdated info * docs/release-notes/index.html: Update list of supported versions * docs/community-guide/releasing.part.html: Minor clarifications Modified: subversion/site/publish/ (props changed) subversion/site/publish/docs/community-guide/releasing.part.html subversion/site/publish/docs/release-notes/index.html subversion/site/publish/faq.html subversion/site/publish/roadmap.html (contents, props changed) Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1898975-1898976,1899267-1899268,1899328 Modified: subversion/site/publish/docs/community-guide/releasing.part.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/community-guide/releasing.part.html?rev=1899365=1899364=1899365=diff == --- subversion/site/publish/docs/community-guide/releasing.part.html (original) +++ subversion/site/publish/docs/community-guide/releasing.part.html Tue Mar 29 21:13:26 2022 @@ -835,9 +835,14 @@ list of available subcommands. set up a white-room rolling environment. This environment must contain pristine versions of some build tools. -It is important that you do not use distribution shipped versions +It is important that you do not use distribution shipped versions of this software as they are often patched in ways that are not -portable. The version numbers given above should normally be +portable (e.g., Debian's libtool patch: +https://bugs.debian.org/291641;>#291641, +https://bugs.debian.org/320698;>#320698.) +The version numbers given in https://svn.apache.org/repos/asf/subversion/trunk/tools/dist/release-lines.yaml; +>tools/dist/release-lines.yaml should normally be reconsidered and increased to the latest stable upstream release in the time leading up to an A.B.0 release. Changing the version within an A.B.x series should only be done with careful consideration. @@ -854,7 +859,7 @@ mkdir -p /opt/svnrm cd /opt/s -Install pristine versions of some build tools +Install some more build tools #before-release-dependencies" title="Link to this section"> Modified: subversion/site/publish/docs/release-notes/index.html URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/index.html?rev=1899365=1899364=1899365=diff == --- subversion/site/publish/docs/release-notes/index.html (original) +++ subversion/site/publish/docs/release-notes/index.html Tue Mar 29 21:13:26 2022 @@ -110,19 +110,18 @@ official support status for the various -1.13.x -Regular Release - - -1.10.x +1.14.x Long-Term Support -1.9.x +1.11.x - 1.13.x +No longer supported + +1.10.x Long-Term Support -1.8.x and earlier +1.9.x and earlier No longer supported Modified: subversion/site/publish/faq.html URL: http://svn.apache.org/viewvc/subversion/site/publish/faq.html?rev=1899365=1899364=1899365=diff == --- subversion/site/publish/faq.html (original) +++ subversion/site/publish/faq.html Tue Mar 29 21:13:26 2022 @@ -321,7 +321,7 @@ See Quick Start No, Subversion is open source / free software. Several companies -(CollabNet, WANdisco, VisualSVN, elego, ...) pay or have payed the salaries +(CollabNet, WANdisco, VisualSVN, elego, ...) pay or have paid the salaries of some full-time developers, but the software carries an https://www.apache.org/licenses/LICENSE-2.0; >Apache License which is fully compliant with Modified: subversion/site/publish/roadmap.html URL: http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1899365=1899364=1899365=diff == --- subversion/site/publish/roadmap.html (original) +++ subversion/site/publish/roadmap.html Tue Mar 29 21:13:26 2022 @@ -33,8 +33,8 @@ title="Link to this section"> -The following is a preliminary timetable for the next few - upcoming releases. Dates, feature deliverables, and even version +At the moment, there is no timetable for the next release. + Dates, feature deliverables, and even version numbers found in this list are all subject to change (and become increasingly more speculative the further out we attempt to project). Fortunately, the same dynamics that allow features to @@ -45,7 +45,7 @@ something about it: your contributions are always welcome! - + We try to roll releases on Wednesdays. Like most of the other information on this page, the day we roll isn't a hard-and-fast @@ -274,61
svn commit: r1899369 - in /subversion/branches/1.10.x: ./ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_subr/ subversion/tests/libsvn_subr/
Author: svn-role Date: Wed Mar 30 04:00:07 2022 New Revision: 1899369 URL: http://svn.apache.org/viewvc?rev=1899369=rev Log: Merge the r1872030 group from trunk: * r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118, r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922, r1872923, r1872924, r1873294, r1873297, r1875188, r1875189 Fix issue #4840, Merge assertion failure in svn_sort__array_insert Justification: A merge with complex mergeinfo could abort with an assertion failure. Votes: +1: stsp, rhuijben, markphip +1: julianfoad (without r1875188,r1875189) Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h subversion/branches/1.10.x/subversion/libsvn_client/merge.c subversion/branches/1.10.x/subversion/libsvn_subr/mergeinfo.c subversion/branches/1.10.x/subversion/libsvn_subr/sorts.c subversion/branches/1.10.x/subversion/tests/libsvn_subr/mergeinfo-test.c Propchange: subversion/branches/1.10.x/ -- Merged /subversion/trunk:r1872030-1872031,1872104,1872107-1872108,1872115,1872118,1872121,1872388,1872433,1872910,1872919,1872921-1872924,1873294,1873297,1875188-1875189 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899369=1899368=1899369=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Wed Mar 30 04:00:07 2022 @@ -21,13 +21,3 @@ Veto-blocked changes: Approved changes: = - - * r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118, - r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922, - r1872923, r1872924, r1873294, r1873297, r1875188, r1875189 - Fix issue #4840, Merge assertion failure in svn_sort__array_insert - Justification: - A merge with complex mergeinfo could abort with an assertion failure. - Votes: - +1: stsp, rhuijben, markphip - +1: julianfoad (without r1875188,r1875189) Modified: subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h?rev=1899369=1899368=1899369=diff == --- subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h (original) +++ subversion/branches/1.10.x/subversion/include/private/svn_sorts_private.h Wed Mar 30 04:00:07 2022 @@ -127,6 +127,16 @@ svn_sort__array_insert(apr_array_header_ const void *new_element, int insert_index); +/* Like svn_sort__array_insert() but raise an error if @a insert_index + * is less than 0 or greater than the length of the array. + * + * @note Private. For use by Subversion's own code only. + */ +svn_error_t * +svn_sort__array_insert2(apr_array_header_t *array, +const void *new_element, +int insert_index); + /* Remove @a elements_to_delete elements starting at @a delete_index from the * array @a arr. If @a delete_index is not a valid element of @a arr, @@ -141,6 +151,16 @@ svn_sort__array_delete(apr_array_header_ int delete_index, int elements_to_delete); +/* Like svn_sort__array_delete() but raise an error if attempting + * to delete a range of elements that goes out of bounds of the array. + * + * @note Private. For use by Subversion's own code only. + */ +svn_error_t * +svn_sort__array_delete2(apr_array_header_t *arr, +int delete_index, +int elements_to_delete); + /* Reverse the order of elements in @a array, in place. * * @note Private. For use by Subversion's own code only. Modified: subversion/branches/1.10.x/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_client/merge.c?rev=1899369=1899368=1899369=diff == --- subversion/branches/1.10.x/subversion/libsvn_client/merge.c (original) +++ subversion/branches/1.10.x/subversion/libsvn_client/merge.c Wed Mar 30 04:00:07 2022 @@ -5951,7 +5951,7 @@ get_most_inclusive_rev(const apr_array_h remaining_ranges is inclusive of END_REV, Slice the first range in to two at END_REV. All the allocations are persistent and allocated from POOL. */ -static void +static svn_error_t * slice_remaining_ranges(apr_array_header_t *children_with_mergeinfo, svn_boolean_t is_rollback, svn_revnum_t end_rev, apr_pool_t *pool) @@ -5981,10 +5981,12 @@
svn commit: r1899371 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Mar 30 04:15:02 2022 New Revision: 1899371 URL: http://svn.apache.org/viewvc?rev=1899371=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=1899371=1899370=1899371=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Mar 30 04:15:02 2022 @@ -2,470 +2,6 @@ Changes in ^/subversion/branches/1.14.x: -https://svn.apache.org/r1877978;>r1877978 | svn-role | 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines - -Merge https://svn.apache.org/r1877788;>r1877788 from trunk: - - * https://svn.apache.org/r1877788;>r1877788 - Fix a broken link in a docstring. - Votes: - +1: danielsh, stsp - - -https://svn.apache.org/r1878211;>r1878211 | svn-role | 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines - -Merge https://svn.apache.org/r1877072;>r1877072 from trunk: - - * https://svn.apache.org/r1877072;>r1877072 - svnmucc: Change an error message to state another possible cause of the - error. - Justification: - Error messages should be accurate. User reported (issue #4854). - Votes: - +1: danielsh, stsp, jcorvel - - -https://svn.apache.org/r1878213;>r1878213 | svn-role | 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines - -Merge https://svn.apache.org/r1877259;>r1877259 from trunk: - -* https://svn.apache.org/r1877259;>r1877259 -Move variable declarations to the start of block the to fix -syntax errors with VC9 (Visual Studio 2008). - Justification: -Our code should be C90. - Votes: -+1: brane, stsp, jcorvel -+0: danielsh (from dev@) - - -https://svn.apache.org/r1878415;>r1878415 | svn-role | 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines - -Merge the https://svn.apache.org/r1876707;>r1876707 group from trunk: - - * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, - https://svn.apache.org/r1878144;>r1878144 - Various fixes for making the test suite run correctly with Python 3 on - Windows. - Justification: - Our test suite should test Subversion correctly also on Windows with - Python 3 - Votes: - +1: futatuki, jcorvel, stsp - - -https://svn.apache.org/r1879245;>r1879245 | svn-role | 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines - -Merge https://svn.apache.org/r1876662;>r1876662 from trunk: - - * https://svn.apache.org/r1876662;>r1876662 - Avoid check for SWIG version for Python bindings when --without-swig is - passed. - Justification: - SWIG python bindings should be able to be built without SWIG when we use - the release tarball - Votes: - +1: futatuki, stsp, rhuijben - - -https://svn.apache.org/r1879246;>r1879246 | svn-role | 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines - -Merge https://svn.apache.org/r1876906;>r1876906 from trunk: - - * https://svn.apache.org/r1876906;>r1876906 - Make gen-make.py --debug work with Python 3 - Justification: - We should also be able to build in Debug configuration with Python 3 - on Windows. - Votes: - +1: jcorvel, stsp, rhuijben - - -https://svn.apache.org/r1879797;>r1879797 | svn-role | 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines - -Merge https://svn.apache.org/r1876410;>r1876410 from trunk: - - * https://svn.apache.org/r1876410;>r1876410 - Fix the .editorconfig stanza for Makefiles. - Justification: - Make $EDITOR do the right thing on any backport branches we may create - off this stabilization branch. - Votes: - +1: danielsh, stsp, jamessan - - -https://svn.apache.org/r1879798;>r1879798 | svn-role | 2020-07-12 04:00:17 + (Sun, 12 Jul 2020) | 9 lines - -Merge https://svn.apache.org/r1878413;>r1878413 from trunk: - - * https://svn.apache.org/r1878413;>r1878413 - autogen.sh: Remove per SWIG bindings checked files on release mode. - Justification: - The release tarballs should not contain .swig_*_checked files
svn commit: r1899354 - /subversion/branches/1.14.x/STATUS
Author: dsahlberg Date: Tue Mar 29 13:28:27 2022 New Revision: 1899354 URL: http://svn.apache.org/viewvc?rev=1899354=rev Log: * STATUS: Remove single whitespace to see if it clears out backport failures Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899354=1899353=1899354=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Tue Mar 29 13:28:27 2022 @@ -61,7 +61,7 @@ Approved changes: 1.14.x-r1899227 Votes: +1: hartmannathan, dsahlberg, rhuijben - + * r1898633 Fix sporadic testCrash_RequestChannel_nativeRead_AfterException failure Justification:
svn commit: r1899355 - /subversion/branches/1.10.x/STATUS
Author: markphip Date: Tue Mar 29 14:03:10 2022 New Revision: 1899355 URL: http://svn.apache.org/viewvc?rev=1899355=rev Log: *STATUS: Add my vote, approving Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899355=1899354=1899355=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Mar 29 14:03:10 2022 @@ -15,6 +15,13 @@ Status of 1.10.8: Candidate changes: == + +Veto-blocked changes: += + +Approved changes: += + * r1872030, r1872031, r1872104, r1872107, r1872108, r1872115, r1872118, r1872121, r1872388, r1872433, r1872910, r1872919, r1872921, r1872922, r1872923, r1872924, r1873294, r1873297, r1875188, r1875189 @@ -22,11 +29,5 @@ Candidate changes: Justification: A merge with complex mergeinfo could abort with an assertion failure. Votes: - +1: stsp, rhuijben + +1: stsp, rhuijben, markphip +1: julianfoad (without r1875188,r1875189) - -Veto-blocked changes: -= - -Approved changes: -=
Re: svn commit: r1899342 - /subversion/site/publish/upcoming.part.html
Seems Infra didn't manage to merge #1015 before the night jobs. If using this file as basis of CHANGES, please verify what changes was already done in 1.14.1. On the bright side, it seems that all cronjobs are actually running as expected on the new svn-qavm instance. /Daniel Den tis 29 mars 2022 kl 06:15 skrev : > Author: svn-role > Date: Tue Mar 29 04:15:02 2022 > New Revision: 1899342 > > URL: http://svn.apache.org/viewvc?rev=1899342=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=1899342=1899341=1899342=diff > > == > --- subversion/site/publish/upcoming.part.html (original) > +++ subversion/site/publish/upcoming.part.html Tue Mar 29 04:15:02 2022 > @@ -2,6 +2,470 @@ > > Changes in ^/subversion/branches/1.14.x: > > +https://svn.apache.org/r1877978;>r1877978 | svn-role | > 2020-05-21 04:00:13 + (Thu, 21 May 2020) | 7 lines > + > +Merge https://svn.apache.org/r1877788;>r1877788 from trunk: > + > + * https://svn.apache.org/r1877788;>r1877788 > + Fix a broken link in a docstring. > + Votes: > + +1: danielsh, stsp > + > + > +https://svn.apache.org/r1878211;>r1878211 | svn-role | > 2020-05-28 04:00:12 + (Thu, 28 May 2020) | 10 lines > + > +Merge https://svn.apache.org/r1877072;>r1877072 from trunk: > + > + * https://svn.apache.org/r1877072;>r1877072 > + svnmucc: Change an error message to state another possible cause of the > + error. > + Justification: > + Error messages should be accurate. User reported ( href="/issue-4854">issue #4854). > + Votes: > + +1: danielsh, stsp, jcorvel > + > + > +https://svn.apache.org/r1878213;>r1878213 | svn-role | > 2020-05-28 04:00:16 + (Thu, 28 May 2020) | 11 lines > + > +Merge https://svn.apache.org/r1877259;>r1877259 from trunk: > + > +* https://svn.apache.org/r1877259;>r1877259 > +Move variable declarations to the start of block the to fix > +syntax errors with VC9 (Visual Studio 2008). > + Justification: > +Our code should be C90. > + Votes: > ++1: brane, stsp, jcorvel > ++0: danielsh (from dev@) > + > + > +https://svn.apache.org/r1878415;>r1878415 | svn-role | > 2020-06-03 04:00:20 + (Wed, 03 Jun 2020) | 12 lines > + > +Merge the https://svn.apache.org/r1876707;>r1876707 group > from trunk: > + > + * https://svn.apache.org/r1876707;>r1876707, https://svn.apache.org/r1876734;>r1876734, https://svn.apache.org/r1877318;>r1877318, https://svn.apache.org/r1877712;>r1877712, https://svn.apache.org/r1878141;>r1878141, https://svn.apache.org/r1878142;>r1878142, https://svn.apache.org/r1878143;>r1878143, > + https://svn.apache.org/r1878144;>r1878144 > + Various fixes for making the test suite run correctly with Python 3 on > + Windows. > + Justification: > + Our test suite should test Subversion correctly also on Windows with > + Python 3 > + Votes: > + +1: futatuki, jcorvel, stsp > + > + > +https://svn.apache.org/r1879245;>r1879245 | svn-role | > 2020-06-27 04:00:12 + (Sat, 27 Jun 2020) | 11 lines > + > +Merge https://svn.apache.org/r1876662;>r1876662 from trunk: > + > + * https://svn.apache.org/r1876662;>r1876662 > + Avoid check for SWIG version for Python bindings when --without-swig is > + passed. > + Justification: > + SWIG python bindings should be able to be built without SWIG when we > use > + the release tarball > + Votes: > + +1: futatuki, stsp, rhuijben > + > + > +https://svn.apache.org/r1879246;>r1879246 | svn-role | > 2020-06-27 04:00:17 + (Sat, 27 Jun 2020) | 10 lines > + > +Merge https://svn.apache.org/r1876906;>r1876906 from trunk: > + > + * https://svn.apache.org/r1876906;>r1876906 > + Make gen-make.py --debug work with Python 3 > + Justification: > + We should also be able to build in Debug configuration with Python 3 > + on Windows. > + Votes: > + +1: jcorvel, stsp, rhuijben > + > + > +https://svn.apache.org/r1879797;>r1879797 | svn-role | > 2020-07-12 04:00:12 + (Sun, 12 Jul 2020) | 10 lines > + > +Merge https://svn.apache.org/r1876410;>r1876410 from trunk: > + > + * https://svn.apache.org/r1876410;>r1876410 > + Fix the .editorconfig stanza for Makefiles. > + Justification: > + Make $EDITOR do the right thing on any backport
svn commit: r1899345 - /subversion/site/staging/packages.html
Author: dsahlberg Date: Tue Mar 29 08:14:01 2022 New Revision: 1899345 URL: http://svn.apache.org/viewvc?rev=1899345=rev Log: * site/staging/packages.html: Update link to TortoiseSVN download page. Reported by: yu-u...@itc-ps.co.jp Modified: subversion/site/staging/packages.html Modified: subversion/site/staging/packages.html URL: http://svn.apache.org/viewvc/subversion/site/staging/packages.html?rev=1899345=1899344=1899345=diff == --- subversion/site/staging/packages.html (original) +++ subversion/site/staging/packages.html Tue Mar 29 08:14:01 2022 @@ -430,7 +430,7 @@ $ apt-get install libapache2-svn https://sharpsvn.open.collab.net/; >SharpSvn project) -https://tortoisesvn.net/downloads/; +https://tortoisesvn.net/downloads.html; >TortoiseSVN (optionally installs 32- and 64-bit command line tools and svnserve; supported and maintained by the https://tortoisesvn.net;
svn commit: r1899346 - in /subversion/site/publish: ./ packages.html
Author: dsahlberg Date: Tue Mar 29 08:15:52 2022 New Revision: 1899346 URL: http://svn.apache.org/viewvc?rev=1899346=rev Log: Cherrypick 1899345 from site/staging to site/publish * site/publish/packages.html: Update the download link for TortoiseSVN Reported by: yu-u...@itc-ps.co.jp Modified: subversion/site/publish/ (props changed) subversion/site/publish/packages.html Propchange: subversion/site/publish/ -- Merged /subversion/site/staging:r1899345 Modified: subversion/site/publish/packages.html URL: http://svn.apache.org/viewvc/subversion/site/publish/packages.html?rev=1899346=1899345=1899346=diff == --- subversion/site/publish/packages.html (original) +++ subversion/site/publish/packages.html Tue Mar 29 08:15:52 2022 @@ -430,7 +430,7 @@ $ apt-get install libapache2-svn https://sharpsvn.open.collab.net/; >SharpSvn project) -https://tortoisesvn.net/downloads/; +https://tortoisesvn.net/downloads.html; >TortoiseSVN (optionally installs 32- and 64-bit command line tools and svnserve; supported and maintained by the https://tortoisesvn.net;
svn commit: r1899349 - /subversion/branches/1.10.x/STATUS
Author: rhuijben Date: Tue Mar 29 08:56:14 2022 New Revision: 1899349 URL: http://svn.apache.org/viewvc?rev=1899349=rev Log: * STATUS: Cast vote. Modified: subversion/branches/1.10.x/STATUS Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899349=1899348=1899349=diff == --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Tue Mar 29 08:56:14 2022 @@ -22,7 +22,7 @@ Candidate changes: Justification: A merge with complex mergeinfo could abort with an assertion failure. Votes: - +1: stsp + +1: stsp, rhuijben +1: julianfoad (without r1875188,r1875189) Veto-blocked changes:
svn commit: r1899344 - /subversion/branches/1.14.x/STATUS
Author: rhuijben Date: Tue Mar 29 07:26:36 2022 New Revision: 1899344 URL: http://svn.apache.org/viewvc?rev=1899344=rev Log: * STATUS: Approve conflict resolver assertion group Modified: subversion/branches/1.14.x/STATUS Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1899344=1899343=1899344=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Tue Mar 29 07:26:36 2022 @@ -39,16 +39,6 @@ Candidate changes: votes: +1: rhuijben - * r1892470, r1892471, r1892541 - Fix an assertion failure triggered by the conflict resolver. - Justification: - Subversion should not crash. User complained. - Votes: - +1: stsp, markphip - +0: dsahlberg (test suite passes for 'check', 'davautocheck' and - 'svnserveautocheck'. Not enough C experience for a formal - review) - Veto-blocked changes: = @@ -90,3 +80,13 @@ Approved changes: 1.14.x-r1881534-no-crlf Votes: +1: hartmannathan, stsp, markphip + + * r1892470, r1892471, r1892541 + Fix an assertion failure triggered by the conflict resolver. + Justification: + Subversion should not crash. User complained. + Votes: + +1: stsp, markphip, rhuijben + +0: dsahlberg (test suite passes for 'check', 'davautocheck' and + 'svnserveautocheck'. Not enough C experience for a formal + review)
