You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/17 18:01:03 UTC
svn commit: r1386680 - /subversion/site/publish/docs/release-notes/1.8.html
Author: stsp
Date: Mon Sep 17 16:01:03 2012
New Revision: 1386680
URL: http://svn.apache.org/viewvc?rev=1386680&view=rev
Log:
* publish/docs/release-notes/1.8.html
(svn-diff): Show proper example diff output.
Modified:
subversion/site/publish/docs/release-notes/1.8.html
Modified: subversion/site/publish/docs/release-notes/1.8.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.8.html?rev=1386680&r1=1386679&r2=1386680&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Mon Sep 17 16:01:03 2012
@@ -438,11 +438,25 @@ attempting to do so will cause the clien
<p>The <tt>svn diff</tt> command can compare arbitrary files with one
another, using the invocation:</p>
-<pre>svn diff --old=FILE1 --new=FILE2</pre>
-This works with any combination of versioned and unversioned files.
+<pre>
+$ svn diff --old foo.c --new bar.c
+Index: bar.c
+===================================================================
+--- bar.c (.../foo.c) (working copy)
++++ bar.c (.../bar.c) (working copy)
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ int main()
+ {
+- printf("Hello world!\n");
++ printf("Good bye world!\n");
+ return 0;
+ }
+</pre>
+
+<p>This works with any combination of versioned and unversioned files.
Comparing arbitrary directories is also supported, in which case the
-directories are walked recursively and files within them are compared:</p>
-<pre>svn diff --old=DIR1 --new=DIR2</pre>
+directories are walked recursively and files within them are compared.</p>
<p><tt>svn diff</tt> also supports the following new options:
<ul>