Author: pburba
Date: Thu Apr 18 18:29:34 2013
New Revision: 1469515
URL: http://svn.apache.org/r1469515
Log:
Fix issue #4355 'svn_client_log5 broken with multiple revisions which span
a rename'.
* subversion/libsvn_client/log.c
(svn_client_log5): Reparent RA session if necessary.
* subversion/tests/cmdline/log_tests.py
(log_multiple_revs_spanning_rename): Remove XFail decorator and tweak
comment re failure status.
Modified:
subversion/trunk/subversion/libsvn_client/log.c
subversion/trunk/subversion/tests/cmdline/log_tests.py
Modified: subversion/trunk/subversion/libsvn_client/log.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/log.c?rev=1469515&r1=1469514&r2=1469515&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/log.c (original)
+++ subversion/trunk/subversion/libsvn_client/log.c Thu Apr 18 18:29:34 2013
@@ -616,6 +616,17 @@ svn_client_log5(const apr_array_header_t
passed_receiver_baton = &lb;
}
+ /* Issue #4355: If multiple REVISION_RANGES were requested we might
+ need to reparent the session to account for renames. */
+ if (i > 0)
+ {
+ const char *old_session_url;
+
+ SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url,
+ ra_session, ra_target,
+ pool));
+ }
+
SVN_ERR(svn_ra_get_log2(ra_session,
condensed_targets,
start_revnum,
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1469515&r1=1469514&r2=1469515&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Thu Apr 18 18:29:34
2013
@@ -2369,7 +2369,6 @@ def merge_sensitive_log_with_search(sbox
# Test for issue #4355 'svn_client_log5 broken with multiple revisions
# which span a rename'.
@Issue(4355)
-@XFail()
@SkipUnless(server_has_mergeinfo)
def log_multiple_revs_spanning_rename(sbox):
"log for multiple revs which span a rename"
@@ -2417,7 +2416,7 @@ def log_multiple_revs_spanning_rename(sb
# Check that log can handle discrete revisions that span a rename.
#
- # Currently this fails with:
+ # Previously this failed with:
#
# >svn log -c2,3 ^/trunk/mu
# ------------------------------------------------------------------------
