Quoth Ben Duncan: > Ok Kurt ..... fill me in here. > > At "Patch" file is that which is the difference of <org> compared to <new>. > The output of that is: > -<org stuff not on new> > and > +<new stuff not on org>
Yup. Specifically, a patch file, or, rather, a "diff" represents the changes you have to make to <orig> in order to produce <new>. > > With the @@ stuff being > @@ -org_line,count +new_line,count @@ > > where < - > count is equal to all the matching lines INCLUDING the > - (minus) prefixed lines in the org file, but less the + (plus) prefixed > lines. > The < + > count is equal to the number of lines in the "New" file > including the + (plus) prefixed lines, but less the - prefixed lines > > The patch procedure is "NORMALLY" run against the <org> file to update the > <org> file to what the patch requires subtracting out the minus and adding > in the > pluses. Correct. Or close enough. I only described a unified diff; there are also "normal" and "context" diffs. It's easier to understand if you have a couple of small files, one being a modified version of the other, and you run the diff command on them to see the output and compare it to the files. Then it becomes clearer. In this respect, the info page for diff is actually pretty helpful. > I hope this is correct. > > Oh man, I am gonna need a drink after thinking on this .... That won't help. It will only make it worse, in fact. Kurt -- Reality is an obstacle to hallucination. _______________________________________________ Linux-users mailing list [EMAIL PROTECTED] Unsubscribe/Suspend/Etc -> http://www.linux-sxs.org/mailman/listinfo/linux-users
