svn commit: r1058167 - /subversion/site/publish/docs/release-notes/1.7.html

[st...@apache.org]

Author: stsp
Date: Wed Jan 12 15:04:30 2011
New Revision: 1058167

URL: http://svn.apache.org/viewvc?rev=1058167&view=rev
Log:
* publish/docs/release-notes/1.7.html
  (cmdline): Mention svn diff --git.

Modified:
    subversion/site/publish/docs/release-notes/1.7.html

Modified: subversion/site/publish/docs/release-notes/1.7.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.7.html?rev=1058167&r1=1058166&r2=1058167&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.7.html (original)
+++ subversion/site/publish/docs/release-notes/1.7.html Wed Jan 12 15:04:30 2011
@@ -368,6 +368,48 @@ files to be shown in their entirety, jus
 
 </div>  <!-- diff-show-copies-as-adds -->
 
+<div class="h4" id="diff-git">
+<h4>svn diff can show git-style diff annotations
+  <a class="sectionlink" href="#diff-git"
+    title="Link to this section">&para;</a>
+</h4>
+<p><code>svn diff</code> takes a new
+<strong><tt>--git</tt></strong> option which causes it to produce extra
+annotations in the diff output, for denoting added, deleted, and copied files.
+This extended diff format was inspired by
+<a href="http://www.kernel.org/pub/software/scm/git/docs/git-diff.html"
+>git-diff</a>.</p>
+
+<p><code>svn diff --git</code> is intended to produce patches which are
+compatible to
+<a href="http://www.kernel.org/pub/software/scm/git/docs/git-apply.html"
+>git-apply</a>, but there are limitations due to differences between
+Subversion and git:
+<ul>
+  <li><code>svn diff</code> currently cannot display rename information.
+      Renames are always shown as a copy and a delete.</li>
+  <li>All paths in patches are shown relative to the repository root to
+      avoid ambiguity. It is possible that the number of leading path
+      components on the left and right side of the patch differ,
+      for instance if a diff between <code>/trunk</code> and
+      <code>/branches/mybranch</code> is shown.
+      This may prevent git-apply from applying such patches without
+      modification.</li>
+</ul>
+</p>
+
+<p>In a future release of Subversion,
+<a href="#patch"><code>svn patch</code></a> will receive support for the
+extra annotations produced by <code>svn diff --git</code>, so that additions,
+copies, renames, and deletions can be handled explicitly rather than
+implicitly.</p>
+
+<p>The same diff format extensions are also supported by
+<a href="http://mercurial.selenic.com">Mercurial</a>.</p>
+
+</div>  <!-- diff-git -->
+
+
 </div>  <!-- cmdline -->
 
 <div class="h3" id="apis">