PS> If you have 2.15 you should be able to just pipe it to patch -p1
PS> it willd do.
KS> Can you pls say this in a way that a dummy would understand! <G> How do
KS> I "pipe" etc... ?
Mmmh, you should really go for a book with an introduction to Unix and its
concepts. The file redirection and pipes are the very basic concepts of Unix.
A pipe is a special redirections that takes the output of a command and
sends it to the input of another one; it is represented by '|' on the shell:
cat file.diff | patch -p1
will send the output of 'cat file.diff' (the file file.diff itself) to
the input of the command 'patch -p1'.
PS>> Otherwise edit the two files and do it by hand.
KS> Which two files, and what do I change?
look at the lines beginning with --- and +++ they tell the names.
the @ lines tell the line numbers, and the lines beginning with '-' are
lines to delete, and the ones beginning with '+' lines to add.
--- A.po Sat Sep 18 20:19:33 1999
+++ EMPTY.po Sat Sep 18 20:19:16 1999
@@ -6,7 +6,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-18 18:19+0200\n"
+"POT-Creation-Date: 1999-09-18 20:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
the file that would be modified is 'EMPTY.po'; near the 6th line (7 lines
are sgowed in the diff output); and you can see the line
'"POT-Creation-Date: 1999-09-18 18:19+0200\n"' is replaced with
the line '"POT-Creation-Date: 1999-09-18 20:19+0200\n"
-- └ bient˘t, Pablo Saratxaga PGP Key available, key ID: 0x8F0E4975