subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1530855 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_client/merge.c
Date Thu, 10 Oct 2013 04:02:06 GMT
Author: svn-role
Date: Thu Oct 10 04:02:06 2013
New Revision: 1530855

URL: http://svn.apache.org/r1530855
Log:
Merge r1523666 from trunk:

 * r1523666
   Fix path corruption in the calculation of reintegration merges.
   Justification:
     User reported path corruption. Possibly leading to invalid merge
     suggestions. See http://svn.haxx.se/users/archive-2013-09/0116.shtml
   Notes:
     This appears to be a regression in 1.8 as 1.7 has a similar check.
     To reproduce the problem, run in a working copy of 1.8.x:
         svn merge --reintegrate ^/subversion/branches/1.7.x
     and look for bad paths in 'Missing ranges' lines, e.g. '.../svnmucc.'
     which should be '.../svnmucc.c'.
   Votes:
     +1: rhuijben, stsp, stefan2

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_client/merge.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1523666

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1530855&r1=1530854&r2=1530855&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Oct 10 04:02:06 2013
@@ -147,17 +147,3 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1523666
-   Fix path corruption in the calculation of reintegration merges.
-   Justification:
-     User reported path corruption. Possibly leading to invalid merge
-     suggestions. See http://svn.haxx.se/users/archive-2013-09/0116.shtml
-   Notes:
-     This appears to be a regression in 1.8 as 1.7 has a similar check.
-     To reproduce the problem, run in a working copy of 1.8.x:
-         svn merge --reintegrate ^/subversion/branches/1.7.x
-     and look for bad paths in 'Missing ranges' lines, e.g. '.../svnmucc.'
-     which should be '.../svnmucc.c'.
-   Votes:
-     +1: rhuijben, stsp, stefan2
-

Modified: subversion/branches/1.8.x/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_client/merge.c?rev=1530855&r1=1530854&r2=1530855&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_client/merge.c Thu Oct 10 04:02:06 2013
@@ -10716,7 +10716,7 @@ log_find_operative_revs(void *baton,
 
           suffix = svn_relpath_skip_ancestor(subtree_missing_this_rev,
                                              source_rel_path);
-          if (suffix)
+          if (suffix && suffix[0] != '\0')
             {
               missing_path = apr_pstrmemdup(pool, path,
                                             strlen(path) - strlen(suffix) - 1);



Mime
View raw message