[SVN-4270] diff -cN shows wrong line changed

• 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: 07/Dec/12 09:43
• Updated: 27/Oct/18 16:28
• Resolved: 15/Jan/13 23:59

Description

"svn diff -cN URL" can show the wrong diff. It marks an unchanged line as added
and doesn't show an added line.

$ svn cat -r341
http://libslax.googlecode.com/svn/trunk/doc/oxtradoc/rfc2629-to-html.slax > f.341
$ svn cat -r342
http://libslax.googlecode.com/svn/trunk/doc/oxtradoc/rfc2629-to-html.slax > f.342
$ svnadmin create repo
$ svnmucc -mm put f.341 file://`pwd`/repo/f
$ svnmucc -mm put f.342 file://`pwd`/repo/f

$ diff -u f.34?
--- f.341	2012-12-07 09:31:29.121339881 +0000
+++ f.342	2012-12-07 09:31:36.749340307 +0000
@@ -2696,6 +2696,7 @@
 table.full {
   border-style: outset;
   border-width: 1px;
+  margin-left: 3em;
   background-color: lightyellow;
   padding: .25em;
   -moz-box-shadow:    0 0 4px #000000;

$ svn diff -c2 file://`pwd`/repo/f
Index: f
===================================================================
--- f	(revision 1)
+++ f	(revision 2)
@@ -2696,6 +2696,7 @@
   vertical-align: top;
 }
 table.full {
+  border-style: outset;
   border-style: outset;
   border-width: 1px;
   background-color: lightyellow;

Subversion 1.6 shows the correct diff:

$ svn1.6 diff -c2 file://`pwd`/repo/f
Index: f
===================================================================
--- f	(revision 1)
+++ f	(revision 2)
@@ -2698,6 +2698,7 @@
 table.full {
   border-style: outset;
   border-width: 1px;
+  margin-left: 3em;
   background-color: lightyellow;
   padding: .25em;
   -moz-box-shadow:    0 0 4px #000000;