subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1553480 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 26 Dec 2013 13:35:00 GMT
Author: rhuijben
Date: Thu Dec 26 13:35:00 2013
New Revision: 1553480

URL: http://svn.apache.org/r1553480
Log:
* subversion/libsvn_client/merge.c
  (adjust_deleted_subtree_ranges): Following up on r1553478, remove outdated
    and mostly duplicated comment.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1553480&r1=1553479&r2=1553480&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Dec 26 13:35:00 2013
@@ -3753,13 +3753,6 @@ adjust_deleted_subtree_ranges(svn_client
                                             younger_rev, older_rev, ctx,
                                             scratch_pool);
 
-  /* If PRIMARY_URL@peg_rev doesn't exist then
-      svn_client__repos_location_segments() typically returns an
-      SVN_ERR_FS_NOT_FOUND error, but if it doesn't exist for a
-      forward merge over ra_neon then we get SVN_ERR_RA_DAV_REQUEST_FAILED.
-      http://subversion.tigris.org/issues/show_bug.cgi?id=3137 fixed some of
-      the cases where different RA layers returned different error codes to
-      signal the "path not found"...but it looks like there is more to do. */
   if (err)
     {
       const char *rel_source_path;  /* PRIMARY_URL relative to RA_SESSION */



Mime
View raw message