Patch for Help - Gettingstarted and GUImenus xml files

[Yawar Amin]

Hi Cristian,

On 2010-11-16, at 13:48, Cristian Marchi wrote:

> I'm not able to apply the patches to my local copy due to my lack of knowledge. I noticed that the heading of files is different from what I'm accostumed to.
> Normally I use the command "patch -po < filename" from the right path.
> Can you apply yourself these patches and point me to some documentation to learn how to apply them?

You can apply the patches by cd’ing to the help/C directory, then running the following:

patch -p3 <0001-Markup-and-tagging-adjustments.patch
patch -p3 <0002-Spelling-grammar-content-adjustments.patch
patch -p3 <0003-Remove-extra-whitespace-add-comments.patch

A little explanation. Sometimes different VCS diff formats don’t talk to each other very well. Sometimes even different versions of Git have trouble talking to each other through patches (but not pulling and merging, but that’s another thing…). So your best bet is ‘patch’. It’s very flexible. The ‘-p3’ option strips three levels of leading directories from the file names (roughly speaking) and applies the patch(es) to whatever file names it is left with. So in my 0001-Markup-and-tagging-adjustments.patch for example, the most important lines (to the patch command) are the ones like:

--- a/help/C/Help_ch_GUIMenus.xml
+++ b/help/C/Help_ch_GUIMenus.xml

Because it really ignores everything that comes before that first --- line. And with ‘-p3’, it strips the a/help/C/, leaving just the file names.

For more on patch, see the man page.

Regards,

Yawar

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 194 bytes
Desc: This is a digitally signed message part
URL: <http://lists.gnucash.org/pipermail/gnucash-devel/attachments/20101116/a691661b/attachment.bin>