[SVN-1572] Builtin diff produces spurious hunk

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: unscheduled
• Component/s: libsvn_diff
• Assignee: Unassigned
• Reporter: Philip Martin
• Created: 26/Oct/03 16:18
• Updated: 27/Oct/18 16:40
• Resolved: 05/Oct/05 16:48

Description

I have a Subversion working copy with libsvn_fs/tree.c version 7519.  I change
the dag_node_cache_get function to add a pool parameter as follows (note I am
using GNU diff as an external diff)

$ svn diff --diff-cmd /usr/bin/diff 
Index: tree.c
===================================================================
--- tree.c      (revision 7519)
+++ tree.c      (working copy)
@@ -209,7 +209,8 @@
    isn't cached. */
 static dag_node_t *
 dag_node_cache_get (svn_fs_root_t *root,
-                    const char *path)
+                    const char *path,
+                    apr_pool_t *pool)
 {
   struct dag_node_cache_t *cache_item;
 

That output is exactly what I expect.  However if I use the builtin diff I get this

$ svn diff 
Index: tree.c
===================================================================
--- tree.c      (revision 7519)
+++ tree.c      (working copy)
@@ -209,7 +209,8 @@
    isn't cached. */
 static dag_node_t *
 dag_node_cache_get (svn_fs_root_t *root,
-                    const char *path)
+                    const char *path,
+                    apr_pool_t *pool)
 {
   struct dag_node_cache_t *cache_item;
 
@@ -4060,7 +4061,7 @@
 
   /* The Subversion filesystem is written in such a way that a given
      line of history may have at most one interesting history point
-     per filesystem revision.  Either that node was edited (and
+     per filesystem revision.  Either that node was edited (and
      possibly copied), or it was copied but not edited.  And a copy
      source cannot be from the same revision as its destination.  So,
      if our history revision matches its node's commit revision, we

There's an extra hunk.  The change is a no-op there isn't even any whitespace
difference.