devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

pointed out that unix-style newlines make these tools work as we want them

Browse source 
to


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3913 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2003-08-02 13:26:44 +00:00
parent f80505c9d0
commit 24ecdfe517
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
www/docs/patch.t
View file

@ -17,6 +17,14 @@ Try one of these:
<li> <a href="http://gnuwin32.sourceforge.net/packages/diffutils.htm">http://gnuwin32.sourceforge.net/packages/diffutils.htm</a> - diff for Windows <li> <a href="http://gnuwin32.sourceforge.net/packages/diffutils.htm">http://gnuwin32.sourceforge.net/packages/diffutils.htm</a> - diff for Windows
</ul> </ul>
<h2>Newlines</h2>
<p>
These tools will assume and operate on "unix-style" newlines. That means all
files that you're diffing and patching etc must have LF newlines only, and
<b>not</b> the Windows/DOS standard CRLF newlines,
<p>
Not complying to this simple fact will cause you grief. Mark my words.
<h2>Creating A Patch</h2> <h2>Creating A Patch</h2>
<p> <p>
We generate diffs (often called patches) using 'diff' in a manner similar to We generate diffs (often called patches) using 'diff' in a manner similar to
@ -80,6 +88,7 @@ manually.
You can use the --dry-run option to patch to make sure that the patch applies You can use the --dry-run option to patch to make sure that the patch applies
clean. It doesn't actually apply the patch, only prints what would happen if clean. It doesn't actually apply the patch, only prints what would happen if
you run it. you run it.
<h2>Removing A Patch</h2>
<p> <p>
You can remove a patch again from the sources by doing the reverse action of You can remove a patch again from the sources by doing the reverse action of
a specific patch. You do this with the -R (or --reverse) options, such as: a specific patch. You do this with the -R (or --reverse) options, such as: