[SVN-4133] "diff -x -w" showing wrong change

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.8.0
• Component/s: libsvn_diff
• Assignee: Unassigned
• Reporter: Philip Martin
• Created: 29/Feb/12 17:46
• Updated: 27/Oct/18 16:29
• Resolved: 11/Jan/13 13:33

Description

r1295152 removed trailing space from Subversion trunk. One of the files affected
was subversion/libsvn_client/merge.c:

svn diff -cr1295152
http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_client/merge.c
Index: merge.c
===================================================================
--- merge.c     (revision 1295151)
+++ merge.c     (revision 1295152)
@@ -1394,7 +1394,7 @@
 {
   const char *moved_to_abspath;
   svn_error_t *err;
-  
+
   *moved_away = FALSE;
 
   err = svn_wc__node_was_moved_away(&moved_to_abspath, NULL,
@@ -1424,7 +1424,7 @@
 {
   const char *moved_from_abspath;
   svn_error_t *err;
-  
+
   *moved_here = FALSE;
 
   err = svn_wc__node_was_moved_here(&moved_from_abspath, NULL,
@@ -7545,7 +7545,7 @@
                      operational depth is empty or files, then the mere
                      existence of operative immediate children means we
                      must record non-inheritable mergeinfo.
-                     
+
                      ### What about svn_depth_immediates?  In that case
                      ### the merge target needs only normal inheritable
                      ### mergeinfo and the target's immediate children will


Those differences should be ignored with "-x -w" resulting in no overall diff,
but a different line shows up:

svn diff -cr1295152 -x -w
http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_client/merge.c
Index: merge.c
===================================================================
--- merge.c     (revision 1295151)
+++ merge.c     (revision 1295152)
@@ -3255,7 +3255,7 @@
               if (is_rollback)
                 {
                   SVN_ERR(svn_rangelist_reverse(child->remaining_ranges,
-                                                scratch_pool));
+                                                scratch_pool));
                   SVN_ERR(svn_rangelist_reverse(parent->remaining_ranges,
                                                 scratch_pool));
                 }

That line hasn't changed at all.