Re: [O] export to odt: error in style.xml
Hi, Achim Gratz strom...@nexgo.de writes: Rasmus writes: Could you please rebase or cherry-pick your changes onto the then-current master before committing them? However, can you please elaborate on what exactly I did wrong? I have checked for the following to understand your criticism: 1. When I do $ git diff 004332b^ 00433b I get a one line diff (except the context). There are no change of white space or other garbage. Why is this not cherry-picked? […] This one is, but your earlier commits introduced half a dozen Let's be clear, there are *two* redundant merges. spurious merges since they were all started at different points on master. I fail to see the relevance of your remark. In principal it is true. However, is it a real issue¹ in practice? The script that generates the ChangeLog for the Emacs merge will list all of these separately and Bastien or who else is doing the merge will have to manually put them back together. Thanks. I will be more careful on this. Bastien b...@gnu.org writes: I was asking no such thing, only that the author name and email you use for your commits are always one and the same. Yes: it's important to use the same name and address so that we can group changelogs under the same person when adding them to Emacs. Thanks. Which file is grouped by author? Looking quickly at ORG-NEWS, it doesn't seem to be grouped by author? Anyway —Rasmus -- C is for Cookie
Re: [O] export to odt: error in style.xml
Achim Gratz strom...@nexgo.de writes: The script that generates the ChangeLog for the Emacs merge will list all of these separately and Bastien or who else is doing the merge will have to manually put them back together. Yes. ¹ It pains me every time I use my private email for public mailing list, but I doubt you had my privacy in mind? I was asking no such thing, only that the author name and email you use for your commits are always one and the same. Yes: it's important to use the same name and address so that we can group changelogs under the same person when adding them to Emacs. Thanks, -- Bastien
Re: [O] export to odt: error in style.xml
Rasmus writes: Could you please rebase or cherry-pick your changes onto the then-current master before committing them? Yes, I am very happy to! However, can you please elaborate on what exactly I did wrong? I have checked for the following to understand your criticism: 1. When I do $ git diff 004332b^ 00433b I get a one line diff (except the context). There are no change of white space or other garbage. Why is this not cherry-picked? […] This one is, but your earlier commits introduced half a dozen spurious merges since they were all started at different points on master. In principal it is true. However, is it a real issue¹ in practice? The script that generates the ChangeLog for the Emacs merge will list all of these separately and Bastien or who else is doing the merge will have to manually put them back together. ¹ It pains me every time I use my private email for public mailing list, but I doubt you had my privacy in mind? I was asking no such thing, only that the author name and email you use for your commits are always one and the same. Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
Re: [O] export to odt: error in style.xml
Hi Detlef, Detlef Steuer detlef.ste...@gmx.de writes: Trying to open an exported ODT document I see the erroe message: format error in styles.xml in position (790,2) I changed the style used by odt in commit 464cd96. The part you refer to is defined in `org-odt-template', but I don't see how it relates to that commit instantly though the regexp part shortly after the comment you point out, might not work. . . Please (always) provide a short example demonstrating your problem. Thanks, Rasmus -- You people at the NSA are becoming my new best friends!
Re: [O] export to odt: error in style.xml
Hi Detlef, Detlef Steuer detlef.ste...@gmx.de writes: I cannot send the file to the list, but maybe you can take a look off list? In the future you should sent minimal examples. In this case it did not matter and the mentioned commit was indeed to blame. It should be fixed in master @ 004332b. Thanks for reporting this. —Rasmus PS: The output of the file you sent me will likely not look like you expect (e.g. missing the table), but that is because of syntax mistakes. -- Lasciate ogni speranza o voi che entrate: siete nella mani di'machellaio
Re: [O] export to odt: error in style.xml
Rasmus writes: In the future you should sent minimal examples. In this case it did not matter and the mentioned commit was indeed to blame. It should be fixed in master @ 004332b. Could you please rebase or cherry-pick your changes onto the then-current master before committing them? Also, you might want to decide on a single mail address for these committs. Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ Factory and User Sound Singles for Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
Re: [O] export to odt: error in style.xml
Hi Achim, Thanks for your helpful message. Achim Gratz strom...@nexgo.de writes: Rasmus writes: In the future you should sent minimal examples. In this case it did not matter and the mentioned commit was indeed to blame. It should be fixed in master @ 004332b. Could you please rebase or cherry-pick your changes onto the then-current master before committing them? Yes, I am very happy to! However, can you please elaborate on what exactly I did wrong? I have checked for the following to understand your criticism: 1. When I do $ git diff 004332b^ 00433b I get a one line diff (except the context). There are no change of white space or other garbage. Why is this not cherry-picked? 2. I know I git pull --rebase'ed before I submitted. I believe the patch was only submitted to master, since it shows up on git log when I'm on the master branch but not on the maint branch. This is true for my local checkout and for cgit online. Why is this not against the current master? 3. There is no nasty Merge branch... so, again, why is it not cherry picked? I'm not claiming to be an expert of anything, least of all of anything–software, so please be explicit so I can learn to commit better. Also, you might want to decide on a single mail address for these committs. In principal it is true. However, is it a real issue¹ in practice? Rest assured it is always a real email address checked frequently. It happens because I use several computers and I sometimes forget to correct .git/config. If it *is* a real issue, I could change my global git config, though it is configured the way it is for a reason. Thanks, Rasmus Footnotes: ¹ It pains me every time I use my private email for public mailing list, but I doubt you had my privacy in mind? -- This is the kind of tedious nonsense up with which I will not put
