svn commit: r1905174 - /subversion/site/publish/upcoming.part.html
Author: svn-role Date: Wed Nov 9 04:15:02 2022 New Revision: 1905174 URL: http://svn.apache.org/viewvc?rev=1905174&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=1905174&r1=1905173&r2=1905174&view=diff == --- subversion/site/publish/upcoming.part.html (original) +++ subversion/site/publish/upcoming.part.html Wed Nov 9 04:15:02 2022 @@ -96,6 +96,33 @@ Merge the https://svn.apache.or +1: futatuki, stsp, jamessan +https://svn.apache.org/r1905172";>r1905172 | svn-role | 2022-11-09 04:00:03 + (Wed, 09 Nov 2022) | 11 lines + +Merge https://svn.apache.org/r1877310";>r1877310 from trunk: + + * https://svn.apache.org/r1877310";>r1877310 + Add a test for issue #4711 "invalid xml file produced by svn log --xml + --verbose --use-merge-history --search". + Justification: + Increase test coverage. + Votes: + +0: danielsh (with appropriate Skip()/XFail() annotations if needed) + +1: hartmannathan, jamessan + + +https://svn.apache.org/r1905173";>r1905173 | svn-role | 2022-11-09 04:00:04 + (Wed, 09 Nov 2022) | 10 lines + +Merge https://svn.apache.org/r1904167";>r1904167 from trunk: + + * https://svn.apache.org/r1904167";>r1904167 + swig-py: Fix conditionals by SWIG version and by Python version for proxy + code. + Justification: + swig-py should be built correctly with upcoming SWIG 4.1.0 release. + Votes: + +1: futatuki, jun66j5, jamessan + + Further changes currently under consideration are listed in each release line's
svn commit: r1905172 - in /subversion/branches/1.14.x: ./ STATUS subversion/tests/cmdline/log_tests.py
Author: svn-role
Date: Wed Nov 9 04:00:03 2022
New Revision: 1905172
URL: http://svn.apache.org/viewvc?rev=1905172&view=rev
Log:
Merge r1877310 from trunk:
* r1877310
Add a test for issue #4711 "invalid xml file produced by svn log --xml
--verbose --use-merge-history --search".
Justification:
Increase test coverage.
Votes:
+0: danielsh (with appropriate Skip()/XFail() annotations if needed)
+1: hartmannathan, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1877310
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905172&r1=1905171&r2=1905172&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 9 04:00:03 2022
@@ -47,15 +47,6 @@ Veto-blocked changes:
Approved changes:
=
- * r1877310
- Add a test for issue #4711 "invalid xml file produced by svn log --xml
- --verbose --use-merge-history --search".
- Justification:
- Increase test coverage.
- Votes:
- +0: danielsh (with appropriate Skip()/XFail() annotations if needed)
- +1: hartmannathan, jamessan
-
* r1904167
swig-py: Fix conditionals by SWIG version and by Python version for proxy
code.
@@ -63,4 +54,3 @@ Approved changes:
swig-py should be built correctly with upcoming SWIG 4.1.0 release.
Votes:
+1: futatuki, jun66j5, jamessan
-
Modified: subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py?rev=1905172&r1=1905171&r2=1905172&view=diff
==
--- subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/branches/1.14.x/subversion/tests/cmdline/log_tests.py Wed Nov 9
04:00:03 2022
@@ -2779,6 +2779,42 @@ def log_on_deleted_deep(sbox):
'',
'-q', '-c', '1-2')
+@XFail()
+@Issue(4711)
+def log_with_merge_history_and_search(sbox):
+ "log --use-merge-history --search"
+
+ sbox.build()
+
+ # r2: create branch
+ sbox.simple_repo_copy('A', 'A2') # r2
+
+ # r3: mod in trunk
+ sbox.simple_append('A/mu', 'line 2')
+ sbox.simple_commit(message='r3: mod')
+ sbox.simple_update()
+
+ # r4: merge
+ svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', sbox.ospath('A2'))
+ sbox.simple_commit(message='r4: merge')
+ sbox.simple_update()
+
+ # Helper function
+ def count(haystack, needle):
+"""Return the number of times the string NEEDLE occurs in the string
+HAYSTACK."""
+return len(haystack.split(needle)) - 1
+
+ # Check the output is valid
+ # ### Since the test is currently XFail, we only smoke test the output.
+ # ### When fixing this test to PASS, extend this validation.
+ _, output, _ = svntest.main.run_svn(None, 'log', '--xml', '-g',
+ '--search', "this will have no matches",
+ sbox.ospath('A2'))
+
+ output = '\n'.join(output)
+ if count(output, "
svn commit: r1905173 - in /subversion/branches/1.14.x: ./ STATUS subversion/bindings/swig/include/proxy.swg
Author: svn-role
Date: Wed Nov 9 04:00:04 2022
New Revision: 1905173
URL: http://svn.apache.org/viewvc?rev=1905173&view=rev
Log:
Merge r1904167 from trunk:
* r1904167
swig-py: Fix conditionals by SWIG version and by Python version for proxy
code.
Justification:
swig-py should be built correctly with upcoming SWIG 4.1.0 release.
Votes:
+1: futatuki, jun66j5, jamessan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg
Propchange: subversion/branches/1.14.x/
--
Merged /subversion/trunk:r1904167
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905173&r1=1905172&r2=1905173&view=diff
==
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Nov 9 04:00:04 2022
@@ -46,11 +46,3 @@ Veto-blocked changes:
Approved changes:
=
-
- * r1904167
- swig-py: Fix conditionals by SWIG version and by Python version for proxy
- code.
- Justification:
- swig-py should be built correctly with upcoming SWIG 4.1.0 release.
- Votes:
- +1: futatuki, jun66j5, jamessan
Modified: subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg?rev=1905173&r1=1905172&r2=1905173&view=diff
==
--- subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg
(original)
+++ subversion/branches/1.14.x/subversion/bindings/swig/include/proxy.swg Wed
Nov 9 04:00:04 2022
@@ -66,7 +66,6 @@
fn()
%}
-#if defined(SWIGPYTHON_PY3)
#if SWIG_VERSION >= 0x04
%pythoncode %{
# -classic and -modern options have been dropped and this variable
@@ -76,7 +75,7 @@
_set_instance_attr =
_swig_setattr_nondynamic_instance_variable(object.__setattr__)
%}
-#else
+#elif defined(SWIGPYTHON_PY3)
%pythoncode %{
# SWIG classes generated with -modern do not define this variable
try:
@@ -90,7 +89,6 @@
_set_instance_attr = _swig_setattr_nondynamic_method(object.__setattr__)
%}
-#endif
#else
%pythoncode %{
# SWIG classes generated with -classic do not define this variable,
svn commit: r1905169 - /subversion/branches/1.14.x/STATUS
Author: jamessan Date: Wed Nov 9 01:01:33 2022 New Revision: 1905169 URL: http://svn.apache.org/viewvc?rev=1905169&view=rev Log: * STATUS: Vote +1 on r1877310, approving. Vote +1 on r1904167, approving. Vote +1 on the r1904198 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=1905169&r1=1905168&r2=1905169&view=diff == --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Nov 9 01:01:33 2022 @@ -15,15 +15,6 @@ Status of 1.14.3: Candidate changes: == - * r1877310 - Add a test for issue #4711 "invalid xml file produced by svn log --xml - --verbose --use-merge-history --search". - Justification: - Increase test coverage. - Votes: - +0: danielsh (with appropriate Skip()/XFail() annotations if needed) - +1: hartmannathan - * r1890223, r1890668, r1890673 Support building on Win64/ARM64. Justification: @@ -41,14 +32,6 @@ Candidate changes: Votes: +1: futatuki, jamessan - * r1904167 - swig-py: Fix conditionals by SWIG version and by Python version for proxy - code. - Justification: - swig-py should be built correctly with upcoming SWIG 4.1.0 release. - Votes: - +1: futatuki, jun66j5 - * r1904198, r1904287 swig-py: build: Don't pass deprecated options to SWIG >= 4.1.0 release Justification: @@ -56,10 +39,28 @@ Candidate changes: Depends: r1878379, r1883719, r1883722, r1884610 Votes: - +1: futatuki + +1: futatuki, jamessan Veto-blocked changes: = Approved changes: = + + * r1877310 + Add a test for issue #4711 "invalid xml file produced by svn log --xml + --verbose --use-merge-history --search". + Justification: + Increase test coverage. + Votes: + +0: danielsh (with appropriate Skip()/XFail() annotations if needed) + +1: hartmannathan, jamessan + + * r1904167 + swig-py: Fix conditionals by SWIG version and by Python version for proxy + code. + Justification: + swig-py should be built correctly with upcoming SWIG 4.1.0 release. + Votes: + +1: futatuki, jun66j5, jamessan +
