svn commit: r1586927 - /subversion/trunk/subversion/libsvn_repos/log.c

[stefan2]

Author: stefan2
Date: Sun Apr 13 06:12:49 2014
New Revision: 1586927

URL: http://svn.apache.org/r1586927
Log:
* subversion/libsvn_repos/log.c
  (fs_mergeinfo_changed): Copies usually know their copy sources.
                          Run the expensive lookup only when they don't.

Modified:
    subversion/trunk/subversion/libsvn_repos/log.c

Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1586927&r1=1586926&r2=1586927&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Sun Apr 13 06:12:49 2014
@@ -865,8 +865,16 @@ fs_mergeinfo_changed(svn_mergeinfo_catal
         case svn_fs_path_change_move:
         case svn_fs_path_change_movereplace:
           {
-            SVN_ERR(svn_fs_copied_from(&base_rev, &base_path,
-                                       root, changed_path, iterpool));
+            if (change->copyfrom_known)
+              {
+                base_rev = change->copyfrom_rev;
+                base_path = change->copyfrom_path;
+              }
+            else
+              {
+                SVN_ERR(svn_fs_copied_from(&base_rev, &base_path,
+                                          root, changed_path, iterpool));
+              }
             break;
           }