Date: Fri, 9 Nov 2012 13:46:44 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r39964 - head/en_US.ISO8859-1/articles/contributing Message-ID: <201211091346.qA9Dkibw082591@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Fri Nov 9 13:46:44 2012 New Revision: 39964 URL: http://svnweb.freebsd.org/changeset/doc/39964 Log: Always prefer unified diff to context diff. While here add '-N' to the diff line for directories Approved by: jkois (mentor) Modified: head/en_US.ISO8859-1/articles/contributing/article.xml Modified: head/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributing/article.xml Fri Nov 9 13:46:41 2012 (r39963) +++ head/en_US.ISO8859-1/articles/contributing/article.xml Fri Nov 9 13:46:44 2012 (r39964) @@ -342,39 +342,22 @@ <para>The preferred &man.diff.1; format for submitting patches is the unified output format generated by <command>diff - -u</command>. However, for patches that substantially - change a region of code, a context output format diff - generated by <command>diff -c</command> may be more readable - and thus preferable.</para> + -u</command>.</para> <indexterm> <primary><command>diff</command></primary> </indexterm> - <para>For example:</para> - - <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen> - - <para>or</para> - - <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen> - - <para>would generate such a set of context diffs for the given - source file or directory hierarchy.</para> - - <para>Likewise,</para> - <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen> <para>or</para> - <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen> + <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen> - <para>would do the same, except in the unified diff - format.</para> + <para>would generate a set of unified diffs for the given source + file or directory hierarchy.</para> - <para>See the manual page for &man.diff.1; for more - details.</para> + <para>See &man.diff.1; for more information.</para> <para>Once you have a set of diffs (which you may test with the &man.patch.1; command), you should submit them for inclusion
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211091346.qA9Dkibw082591>