{"thread":{"id":"15373","subject":"[BUG] Problem compiling documentation","startedAt":"2008-09-04T10:43:59Z","lastAt":"2008-09-05T06:09:20Z","messageCount":5,"participants":["Gustaf Hendeby","Johan Herland","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"89755","messageId":"48BFBBEF.6010403@isy.liu.se","threadId":"15373","inReplyTo":null,"subject":"[BUG] Problem compiling documentation","fromName":"Gustaf Hendeby","fromEmail":"hendeby@isy.liu.se","sentAt":"2008-09-04T10:43:59Z","receivedAt":"2008-09-04T10:43:59Z","isPatch":false,"sender":{"key":"hendeby@isy.liu.se","avatar":"https://avatars.githubusercontent.com/u/730316?v=4"},"body":"Hi!\n\nTrying to compile the documentation from next has failed for me for a\nwhile and now I got to the point where I tracked down the offending\ncommit: 70a3f89733a (git-merge documentation: describe how conflict is\npresented).\n\nI don't have time to dig much deeper into this until later today, but it\nseems to be that the conflict markers are interpreted to indicate a\nsection heading, that is then not correctly formated. The error i get\nis listed below. Feel free to try to beat me to finding a nice solution. :)\n\nI am using xmlto 0.0.21 and Asciidoc 8.2.7.\n\n/Gustaf\n\nxmlto -m callouts.xsl man git-merge.xml\nxmlto: input does not validate (status 1)\n/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :\nattributes construct error\n\"<<<<\"=======\">>>>>\". The p\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :\nCouldn't find end of Start Tag link line 551\n\"<<<<\"=======\">>>>>\". The p\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:551: parser error :\nOpening and ending tag mismatch: simpara line 550 and link\n\"<<<<\"=======\">>>>>\". The p\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:552: parser error :\nOpening and ending tag mismatch: refsect1 line 526 and simpara\ntypically your side, and the part after it is typically their\nside.\n\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :\nattributes construct error\nIn addition to the \"<<<<\"=======\"&\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :\nCouldn't find end of Start Tag link line 577\nIn addition to the \"<<<<\"=======\"&\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:577: parser error :\nOpening and ending tag mismatch: simpara line 577 and link\nIn addition to the \"<<<<\"=======\"&\n\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:582: parser error :\nOpening and ending tag mismatch: refentry line 3 and simpara\nviewing the original.\n ^\n/scratch/src/git/git/Documentation/git-merge.xml:584: parser error :\nExtra content at the end of the document\n\n^\n"},{"id":"89795","messageId":"200809042348.48570.johan@herland.net","threadId":"15373","inReplyTo":"48BFBBEF.6010403@isy.liu.se","subject":"[PATCH] Fix AsciiDoc errors in merge documentation","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2008-09-04T21:48:48Z","receivedAt":"2008-09-04T21:48:48Z","isPatch":true,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"In the section on conflict markers, the \"<<<<<<<\" sequence is compiled by\nAsciiDoc into invalid XML. A way to resolve this is by inserting something\nbetween the last two characters in that sequence (i.e. between '<' and '\"').\n\nThis patch encloses the conflict markers in backticks, which renders them\nin a monospace font (in the HTML version; the manual page is unaffected),\nand with the pleasant side-effect that it also fixes the AsciiDoc compile\nproblem.\n\nSigned-off-by: Johan Herland \n---\n\nOn Thursday 04 September 2008, Gustaf Hendeby wrote:\n> Trying to compile the documentation from next has failed for me for a\n> while and now I got to the point where I tracked down the offending\n> commit: 70a3f89733a (git-merge documentation: describe how conflict is\n> presented).\n\nThis fixes the problem for me.\n\n\nHave fun! :)\n\n...Johan\n\n\n Documentation/git-merge.txt | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 69dd872..1f30830 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -146,8 +146,8 @@ And here is another line that is cleanly resolved or unmodified.\n ------------\n \n The area a pair of conflicting changes happened is marked with markers\n-\"<<<<<<\", \"=======\", and \">>>>>>>\". The part before the \"=======\" is\n-typically your side, and the part after it is typically their side.\n+\"`<<<<<<<`\", \"`=======`\", and \"`>>>>>>>`\". The part before the \"`=======`\"\n+is typically your side, and the part after it is typically their side.\n \n The default format does not show what the original said in the conflicted\n area. You cannot tell how many lines are deleted and replaced with the\n@@ -173,8 +173,8 @@ Git makes conflict resolution easy.\n And here is another line that is cleanly resolved or unmodified.\n ------------\n \n-In addition to the \"<<<<<<\", \"=======\", and \">>>>>>>\" markers, it uses\n-another \"|||||||\" marker that is followed by the original text. You can\n+In addition to the \"`<<<<<<<`\", \"`=======`\", and \"`>>>>>>>`\" markers, it uses\n+another \"`|||||||`\" marker that is followed by the original text. You can\n tell that the original just stated a fact, and your side simply gave in to\n that statement and gave up, while the other side tried to have a more\n positive attitude. You can sometimes come up with a better resolution by\n-- \n1.6.0.96.g2fad1\n"},{"id":"89799","messageId":"48C06086.7080405@isy.liu.se","threadId":"15373","inReplyTo":"200809042348.48570.johan@herland.net","subject":"Re: [PATCH] Fix AsciiDoc errors in merge documentation","fromName":"Gustaf Hendeby","fromEmail":"hendeby@isy.liu.se","sentAt":"2008-09-04T22:26:14Z","receivedAt":"2008-09-04T22:26:14Z","isPatch":true,"sender":{"key":"hendeby@isy.liu.se","avatar":"https://avatars.githubusercontent.com/u/730316?v=4"},"body":"Johan Herland wrote:\n> On Thursday 04 September 2008, Gustaf Hendeby wrote:\n>> Trying to compile the documentation from next has failed for me for a\n>> while and now I got to the point where I tracked down the offending\n>> commit: 70a3f89733a (git-merge documentation: describe how conflict is\n>> presented).\n> \n> This fixes the problem for me.\n\nNice, solves my problems too. Thanks!\n\nTested-by: Gustaf Hendeby \n\n/Gustaf\n\n\nbegin:vcard\nfn:Gustaf Hendeby\nn:Hendeby;Gustaf\norg;quoted-printable:Link=C3=B6pings universitet;Department of Electrical Enginering\nadr;quoted-printable:;;;Link=C3=B6ping;;SE-581 83;Sweden\nemail;internet:hendeby@isy.liu.se\ntitle:Research Associate\ntel;work:+46 14 28 22 26\ntel;cell:+46 730 64 64 89\nx-mozilla-html:FALSE\nurl:http://www.control.isy.liu.se/~hendeby\nversion:2.1\nend:vcard\n\n"},{"id":"89804","messageId":"7vbpz31oup.fsf@gitster.siamese.dyndns.org","threadId":"15373","inReplyTo":"200809042348.48570.johan@herland.net","subject":"Re: [PATCH] Fix AsciiDoc errors in merge documentation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-04T23:19:10Z","receivedAt":"2008-09-04T23:19:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johan Herland writes:\n\n> In the section on conflict markers, the \"<<<<<<<\" sequence is compiled by\n> AsciiDoc into invalid XML. A way to resolve this is by inserting something\n> between the last two characters in that sequence (i.e. between '<' and '\"').\n>\n> This patch encloses the conflict markers in backticks, which renders them\n> in a monospace font (in the HTML version; the manual page is unaffected),\n> and with the pleasant side-effect that it also fixes the AsciiDoc compile\n> problem.\n>\n> Signed-off-by: Johan Herland \n> ---\n>\n> On Thursday 04 September 2008, Gustaf Hendeby wrote:\n>> Trying to compile the documentation from next has failed for me for a\n>> while and now I got to the point where I tracked down the offending\n>> commit: 70a3f89733a (git-merge documentation: describe how conflict is\n>> presented).\n>\n> This fixes the problem for me.\n\nThanks. It's good to see issues with new changes are resolved while they\nare still in 'next'.\n\nHave you tried this patch without double quotes around the teletype text,\nby the way?\n"},{"id":"89824","messageId":"200809050809.20791.johan@herland.net","threadId":"15373","inReplyTo":"7vbpz31oup.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Fix AsciiDoc errors in merge documentation","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2008-09-05T06:09:20Z","receivedAt":"2008-09-05T06:09:20Z","isPatch":true,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Friday 05 September 2008, Junio C Hamano wrote:\n> Johan Herland writes:\n> > [...]\n>\n> Thanks. It's good to see issues with new changes are resolved while they\n> are still in 'next'.\n\nHey, that's what next is for, isn't it? ;)\n\n> Have you tried this patch without double quotes around the teletype text,\n> by the way?\n\nSeems to work fine, as well.\n\n\n...Johan\n\n-- \nJohan Herland, \nwww.herland.net\n"}]}