Hi Clythie,
Le 17 déc. 06 à 14:04, Clytie Siddall a écrit :
Ooops .. Sorry ... we always read/write so much patchs that it
becomes "natural" for us to read them like usual code or text.
I'm not really used to patches, but I still recognize a diff when I
see one. ;)
(What is the main difference between a patch and a diff? I don't
recognize the line with the @ symbols.)
If you mean the extension ? None :-)
But if you mean the tool (either diff or patch, to be used in command
line ):
1) diff is used to create a patch, and this patch, means a file
containing differences between two files or trees ( for recursive
patches)
The result can ends using whatever extension (or suffix ), like
" .diff " or " .patch " or even nothing :-)
We generally use " .diff " or " .patch" suffix because some text
editors do recognize they are patches and present the content using
colored syntaxis : red for old , green for new e.g.
An example :
diff -u file.cxx file_new.cxx > differences.diff
u : patch is written repecting unified format
Using mc , differences.diff will contain what is new in file_new.cxx
in green (added) , and removed in red (present in file.cxx, but not
in file_new.cxx )
2) patch : the tool to apply a patch
e.g. :
patch -p0 --dry-run <differences.diff
In the current dir, we simulate the application of differences.diff
without cut directory ( -p1 cuts one level ..etc) in the paths the
patch does contain, so without apply it really ( but all warning
errors appear and inform the developer the patch can or not be
applied safely for true )
Last :
@number is the line where the changes have to be applied in the
concerned file. Other parameters are offset in the line ..etc and
some black magic for newbies things :-)
Short answer : diff and patch are complementary tools :-)
But I agree with you, eric: we shouldn't assume that everyone
understands these things. That's the sort of assumption that
discourages people from participating, especially people without
much technical background, but who have other skills (e.g.
translating, doc-writing, proofreading, webpage design, promotion,
communication) which we need!
Agreed : qa is the frontier between the two worlds, and I'll take
care next time :-)
Regards,
Eric
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
