Thanks for the help but when i run the first command from a fresh svn
checkout I get this:
crist...@cigno:~/GNUCASH/gnucash-docs/help/C$ patch -p3
<0001-Markup-and-tagging-adjustments.patch
patching file Help_ch_GUIMenus.xml
Hunk #1 FAILED at 34.
Hunk #2 FAILED at 48.
Hunk #3 FAILED at 148.
Hunk #4 FAILED at 205.
Hunk #5 FAILED at 227.
Hunk #6 FAILED at 264.
Hunk #7 FAILED at 288.
Hunk #8 FAILED at 424.
Hunk #9 FAILED at 720.
Hunk #10 FAILED at 802.
Hunk #11 FAILED at 883.
Hunk #12 FAILED at 947.
Hunk #13 FAILED at 1011.
Hunk #14 FAILED at 1089.
Hunk #15 FAILED at 1112.
Hunk #16 FAILED at 1224.
Hunk #17 FAILED at 1311.
Hunk #18 FAILED at 1576.
Hunk #19 succeeded at 1404 with fuzz 1 (offset -186 lines).
Hunk #20 FAILED at 1643.
Hunk #21 FAILED at 1732.
Hunk #22 FAILED at 1763.
Hunk #23 succeeded at 1623 with fuzz 1 (offset -211 lines).
Hunk #24 FAILED at 1903.
Hunk #25 FAILED at 1926.
Hunk #26 FAILED at 1952.
Hunk #27 FAILED at 1981.
Hunk #28 FAILED at 2119.
Hunk #29 FAILED at 2356.
Hunk #30 FAILED at 2620.
Hunk #31 FAILED at 2668.
Hunk #32 FAILED at 2771.
Hunk #33 FAILED at 3001.
Hunk #34 FAILED at 3016.
Hunk #35 FAILED at 3049.
Hunk #36 FAILED at 3138.
Hunk #37 FAILED at 3161.
Hunk #38 FAILED at 3216.
Hunk #39 FAILED at 3364.
Hunk #40 FAILED at 3571.
Hunk #41 succeeded at 3890 (offset 230 lines).
Hunk #42 FAILED at 3681.
Hunk #43 FAILED at 3811.
Hunk #44 FAILED at 3903.
Hunk #45 FAILED at 4094.
Hunk #46 FAILED at 4148.
Hunk #47 FAILED at 4232.
Hunk #48 FAILED at 4261.
Hunk #49 FAILED at 4303.
Hunk #50 succeeded at 5230 with fuzz 2 (offset 885 lines).
46 out of 50 hunks FAILED -- saving rejects to file Help_ch_GUIMenus.xml.rej
patching file Help_ch_GettingStarted.xml
Hunk #1 FAILED at 29.
Hunk #2 FAILED at 46.
Hunk #3 FAILED at 132.
Hunk #4 FAILED at 240.
Hunk #5 FAILED at 385.
Hunk #6 succeeded at 528 with fuzz 2 (offset 116 lines).
Hunk #7 FAILED at 427.
Hunk #8 succeeded at 559 with fuzz 1 (offset 118 lines).
Hunk #9 FAILED at 452.
Hunk #10 FAILED at 461.
Hunk #11 FAILED at 481.
Hunk #12 FAILED at 489.
Hunk #13 FAILED at 531.
Hunk #14 FAILED at 581.
Hunk #15 FAILED at 627.
Hunk #16 FAILED at 638.
Hunk #17 FAILED at 650.
Hunk #18 FAILED at 671.
Hunk #19 FAILED at 706.
Hunk #20 FAILED at 765.
18 out of 20 hunks FAILED -- saving rejects to file
Help_ch_GettingStarted.xml.rej
Sorry but my knowledge in this field is very limited!
Il 17/11/2010 04:12, Yawar Amin ha scritto:
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
_______________________________________________
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
