summaryrefslogtreecommitdiff
path: root/www/docs
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-08-02 13:26:44 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-08-02 13:26:44 +0000
commit24ecdfe51780b4478cfd08132c95d47985d7971c (patch)
treee05a6f7a14eca569623e83bd323f2751fd0ef40c /www/docs
parentf80505c9d0275ce56b9d03b01aa96a5ad2ac0b59 (diff)
downloadrockbox-24ecdfe51780b4478cfd08132c95d47985d7971c.tar.gz
rockbox-24ecdfe51780b4478cfd08132c95d47985d7971c.zip
pointed out that unix-style newlines make these tools work as we want them
to git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3913 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'www/docs')
-rw-r--r--www/docs/patch.t9
1 files changed, 9 insertions, 0 deletions
diff --git a/www/docs/patch.t b/www/docs/patch.t
index 3283af35ee..ab43ed1606 100644
--- a/www/docs/patch.t
+++ b/www/docs/patch.t
@@ -17,6 +17,14 @@ Try one of these:
17<li> <a href="http://gnuwin32.sourceforge.net/packages/diffutils.htm">http://gnuwin32.sourceforge.net/packages/diffutils.htm</a> - diff for Windows 17<li> <a href="http://gnuwin32.sourceforge.net/packages/diffutils.htm">http://gnuwin32.sourceforge.net/packages/diffutils.htm</a> - diff for Windows
18</ul> 18</ul>
19 19
20<h2>Newlines</h2>
21<p>
22 These tools will assume and operate on "unix-style" newlines. That means all
23files that you're diffing and patching etc must have LF newlines only, and
24<b>not</b> the Windows/DOS standard CRLF newlines,
25<p>
26 Not complying to this simple fact will cause you grief. Mark my words.
27
20<h2>Creating A Patch</h2> 28<h2>Creating A Patch</h2>
21<p> 29<p>
22 We generate diffs (often called patches) using 'diff' in a manner similar to 30 We generate diffs (often called patches) using 'diff' in a manner similar to
@@ -80,6 +88,7 @@ manually.
80 You can use the --dry-run option to patch to make sure that the patch applies 88 You can use the --dry-run option to patch to make sure that the patch applies
81clean. It doesn't actually apply the patch, only prints what would happen if 89clean. It doesn't actually apply the patch, only prints what would happen if
82you run it. 90you run it.
91<h2>Removing A Patch</h2>
83<p> 92<p>
84 You can remove a patch again from the sources by doing the reverse action of 93 You can remove a patch again from the sources by doing the reverse action of
85a specific patch. You do this with the -R (or --reverse) options, such as: 94a specific patch. You do this with the -R (or --reverse) options, such as: