From 24ecdfe51780b4478cfd08132c95d47985d7971c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 2 Aug 2003 13:26:44 +0000 Subject: [PATCH] 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 --- www/docs/patch.t | 9 +++++++++ 1 file changed, 9 insertions(+) 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:
  • http://gnuwin32.sourceforge.net/packages/diffutils.htm - diff for Windows +

    Newlines

    +

    + 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 +not the Windows/DOS standard CRLF newlines, +

    + Not complying to this simple fact will cause you grief. Mark my words. +

    Creating A Patch

    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 clean. It doesn't actually apply the patch, only prints what would happen if you run it. +

    Removing A Patch

    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: