You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by fi...@apache.org on 2007/10/12 04:21:07 UTC

svn commit: r584027 - /labs/webarch/trunk/http/draft-fielding-http/diffs.html

Author: fielding
Date: Thu Oct 11 19:21:06 2007
New Revision: 584027

URL: http://svn.apache.org/viewvc?rev=584027&view=rev
Log:
Explain how to make diffs to see the spec changes.


Added:
    labs/webarch/trunk/http/draft-fielding-http/diffs.html   (with props)

Added: labs/webarch/trunk/http/draft-fielding-http/diffs.html
URL: http://svn.apache.org/viewvc/labs/webarch/trunk/http/draft-fielding-http/diffs.html?rev=584027&view=auto
==============================================================================
--- labs/webarch/trunk/http/draft-fielding-http/diffs.html (added)
+++ labs/webarch/trunk/http/draft-fielding-http/diffs.html Thu Oct 11 19:21:06 2007
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-US">
+   <head>
+      <title>HTTP/1.1 Redraft: Notes on diffs</title>
+      <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
+      <link rel="stylesheet" type="text/css" href="http://labs.apache.org/css/html.css" media="screen, projection, tv" />
+      <link rel="stylesheet" type="text/css" href="http://labs.apache.org/css/layout.css" media="screen, projection, tv" />
+      <link rel="stylesheet" type="text/css" href="http://labs.apache.org/css/print.css" media="print" />
+   </head>
+   <body>
+      <div id="header">
+         <a href="http://labs.apache.org/"><img src="http://labs.apache.org/images/bg/top_left.jpg" alt="left slice" class="left" /></a> <img src="http://labs.apache.org/images/bg/top_right.jpg" alt="right slice" class="right" />
+      </div>
+      <div id="content">
+         <div id="mainMenu">
+            <ul class="floatLeft">
+               <li><a href="http://labs.apache.org/webarch/" title="Home">Home</a></li>
+               <li><a href="./" title="HTTP">HTTP</a></li>
+               <li><a href="../../uri/" title="URI">URI</a></li>
+               <li><a href="http://lists.w3.org/Archives/Public/ietf-http-wg/" title="Mailing Lists and Archives">Mailing Lists</a></li>
+               <li><a href="http://issues.apache.org/jira/browse/LABS/component/12311588" title="Issues">Issues</a></li>
+               <li><a href="diffs.html" title="Diffs" class="here">Diffs</a></li>
+               <li><a href="http://svn.apache.org/repos/asf/labs/webarch/trunk/http/draft-fielding-http/" title="Repository" class="last">Repository</a></li>
+            </ul>
+         </div>
+         <div id="page">
+            <div class="gradient">
+               <h1>HTTP/1.1 Redraft: Notes on diffs</h1>
+
+<p>I spent a lot of time trying to minimize changes during the partition
+   of RFC 2616 into the first seven parts, such that the set of differences
+   would be limited to either removing entire sections (because they belong
+   in a different part) or replacing xref markup with entity references
+   (because the XSLT doesn't understand multi-file references).</p>
+                  
+<p>The GNU <code>diff -du oldfile newfile</code> command is quite good at producing
+   a minimal diff against the baseline <a href="rfc2616.xml">rfc2626.xml</a>.
+   Unfortunately, I can't say the same for any of the other diff utilities that
+   I have tried. In particular, the viewvc program on Apache's subversion is
+   worse than hopeless for large changes due to a lame algorithm in Python's difflib.</p>
+                  
+<p>In any case, the partitioning is done (as of rev 584020) and now it is
+   time for some real changes to the text.  If you want to see the changes
+   during partitioning, then I suggest checking out the baseline tag in
+   subversion:
+<code>svn co http://svn.apache.org/repos/asf/labs/webarch/tags/draft-fielding-http/partioned2616</code>
+   and then use "diff -du" directly on the files.</p>
+   
+<p>If you want to see the text changes after the partitioning, you can
+   checkout trunk (see
+   <a href="http://svn.apache.org/repos/asf/labs/webarch/trunk/http/draft-fielding-http/">Repository</a>)
+   and do diffs against rev 584020, such as:
+   <code>svn diff -r584020 p1-messaging.html</code>
+   or checkout both trunk and the partitioned2616 tag (above) and do file diffs.</p>
+
+<p>Finally, for small changes, the viewvc script is adequate and you can
+   <a href="http://svn.apache.org/viewvc/labs/webarch/trunk/http/draft-fielding-http/">see
+   the individual changes per file online with fancy diffs</a>.</p>
+   
+            </div>
+         </div>
+      </div>
+      <div id="footer">
+         <div id="width">
+            <span class="floatLeft">Copyright © 2007 The <a href="http://www.apache.org/" title="The Apache Software Foundation">Apache Software Foundation</a></span> <span class="floatRight">design <a href="http://labs.apache.org/credits.html" title="Credits">credits</a> <span class="grey">|</span> valid <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML">XHTML</a> <span class="grey">|</span> valid <a href="http://jigsaw.w3.org/css-validator?uri=referer" title="Validate CSS">CSS</a></span>
+         </div>
+      </div>
+   </body>
+</html>

Propchange: labs/webarch/trunk/http/draft-fielding-http/diffs.html
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org