Thanks Kurt .... still pretty foggy, but the Sun IS starting to lift on it.

Anyway, When the output of the DIFF is run in a patch routine,
Do the "Minuses" get taken away and the "Pluses" added to the
routine being patched ?

Thanks ..

Kurt Wall wrote:

"@@ ... @@" characterizes a "hunk" or set of differences between the files compared. "-M,N +O,P" says the N-sized context starting at line M
in the first file maps to the P-sized context starting at line O in the
second file, after the change "described" in the following lines is
applied to the first file. Consider the following:


$ diff -u config.orig config
@@ -65,7 +65,6 @@
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_SSE2=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_SMP=y
 # CONFIG_PREEMPT is not set

This says that the that read "CONFIG_X86_SSE2=y" was deleted (hence the
"-") from the first file (config.orig), which looked like this:

65 CONFIG_X86_GOOD_APIC=y
66 CONFIG_X86_INTEL_USERCOPY=y
67 CONFIG_X86_USE_PPRO_CHECKSUM=y
68 CONFIG_X86_SSE2=y
69 # CONFIG_HUGETLB_PAGE is not set
70 CONFIG_SMP=y
71 # CONFIG_PREEMPT is not set

The second file (config) looked like this after the deleted line:

65 CONFIG_X86_GOOD_APIC=y
66 CONFIG_X86_INTEL_USERCOPY=y
67 CONFIG_X86_USE_PPRO_CHECKSUM=y
68 # CONFIG_HUGETLB_PAGE is not set
69 CONFIG_SMP=y
70 # CONFIG_PREEMPT is not set

Understand?

Kurt


--
Ben Duncan   Phone (601)-355-2574     Fax (601)-355-2573   Cell (601)-946-1220
                        Business Network Solutions
                     336 Elton Road  Jackson MS, 39212
   "Software is like Sex, it is better when it's free" - Linus Torvalds

_______________________________________________
Linux-users mailing list
[EMAIL PROTECTED]
Unsubscribe/Suspend/Etc -> http://www.linux-sxs.org/mailman/listinfo/linux-users

Reply via email to