Re: [e-users] xscreensaver messages

[Massimo M. <mai...@gm...>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

en...@sb... scrisse il giorno 08/08/2005 18:47:

> 'man patch' has some good info, but I guess what I'm really wanting to
> know is where to get information on the format of patch files so that i
> can understand better how to read them.

patch files are generated from the diff command, so maybe a 'man diff'
could clarify a bit more for you.

the output of diff is basically a comparison between two files.
without -u option the output looks like this:
2,3c2,3

< # For a description of the syntax of this configuration file,

< # see Documentation/kbuild/kconfig-language.txt.

- ---

> # Per una descrizione della sintassi di questo file di
configurazione
> # vedere Documentation/kbuild/kconfig-language.txt.

first you will see in what rows the difference is (the numbers at the
top), then the difference between files is shown prepending '<' and
'>' before the lines, respectively for the lines in the first file and
the lines in the second.

if we give diff the -u option, then the output will be like this:
- --- 2.6.12-en/arch/alpha/Kconfig        2005-06-19 16:38:51.000000000
+0200
+++ 2.6.12-it/arch/alpha/Kconfig        2005-06-26 10:12:49.000000000
+0200
@@ -1,14 +1,15 @@

 #

- -# For a description of the syntax of this configuration file,

- -# see Documentation/kbuild/kconfig-language.txt.

+# Per una descrizione della sintassi di questo file di configurazione

+# vedere Documentation/kbuild/kconfig-language.txt.

this time we have the name of compared files, then the different rows
(between '@@'), and the prefix for different lines is now a plus or
minus sign.
this is the format of diff file to give as input for patch; patch will
remove lines starting with '-' and add lines starting with '+' (unless
you specify the -R option :)

- --
         Massimo Maiurana          mailto:mai...@gm...
	 http://massimo.solira.org       GPG keyID #7044D601

Articolo 11 - L'Italia ripudia la guerra come strumento di offesa alla
libertà  degli  altri  popoli   e  come  mezzo  di  risoluzione  delle
controversie internazionali....
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC96ggLUrLvHBE1gERAs8zAJ9CH5AZvMAFh33Z8bHKkJuL+W2N9ACfXIz9
8INAYStEn/YA46Gz0loMoQ4=
=19xC
-----END PGP SIGNATURE-----