subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1138830 - in /subversion/trunk/subversion: libsvn_client/log.c tests/cmdline/log_tests.py
Date Thu, 23 Jun 2011 11:07:56 GMT
Author: stsp
Date: Thu Jun 23 11:07:56 2011
New Revision: 1138830

URL: http://svn.apache.org/viewvc?rev=1138830&view=rev
Log:
Fix for issue 3931. 'svn log' is returning log of unrelated path when
peg revision is not related to operative revision. This is happening
when HEAD is used in operative range. This commit fixes this.

* subversion/libsvn_client/log.c
  (svn_client_log5): Handle HEAD in operative revision range.

* subversion/tests/cmdline/log_tests.py
  (log_with_unrelated_peg_and_operative_revs): Remove XFail marker.
    Fix expected error message.

Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

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=1138830&r1=1138829&r2=1138830&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/log.c (original)
+++ subversion/trunk/subversion/libsvn_client/log.c Thu Jun 23 11:07:56 2011
@@ -367,6 +367,11 @@ svn_client_log5(const apr_array_header_t
                   (range->start.value.number > range->end.value.number ?
                    range->start : range->end);
             }
+          else if (range->start.kind == svn_opt_revision_head ||
+                   range->end.kind == svn_opt_revision_head)
+            {
+              session_opt_rev.kind = svn_opt_revision_head;
+            }
           else if (range->start.kind == svn_opt_revision_date &&
                    range->end.kind == svn_opt_revision_date)
             {

Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1138830&r1=1138829&r2=1138830&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Thu Jun 23 11:07:56 2011
@@ -1975,7 +1975,6 @@ def merge_sensitive_log_ignores_cyclic_m
 
 #----------------------------------------------------------------------
 @Issue(3931)
-@XFail()
 def log_with_unrelated_peg_and_operative_revs(sbox):
   "log with unrelated peg and operative rev targets"
 
@@ -2000,7 +1999,7 @@ def log_with_unrelated_peg_and_operative
   # 'Unable to find repository location for ^/A/D/G/rho in revision 9'
   # error, the log for ^/A/D/G/rho@8 is returned, but that is an unrelated
   # line of history.
-  expected_error = ".*File not found.*"
+  expected_error = ".*Unable to find repository location for.*"
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'log', '-r', '2:HEAD', target)
   svntest.actions.run_and_verify_svn(None, None, expected_error,



Mime
View raw message