From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: export to odt: error in style.xml Date: Fri, 10 Oct 2014 20:58:12 +0200 Message-ID: <8738aveoqj.fsf@Rainer.invalid> References: <20141007142000.7ec1745b@gaia> <87sij0ovoo.fsf@gmx.us> <877g0bu5en.fsf@Rainer.invalid> <87zjd71l8x.fsf@gmx.us> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcfOc-0003fa-KQ for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 14:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XcfOV-0008DX-1z for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 14:58:34 -0400 Received: from plane.gmane.org ([80.91.229.3]:59470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcfOU-0008DJ-Rn for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 14:58:26 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XcfOT-0005hO-4u for emacs-orgmode@gnu.org; Fri, 10 Oct 2014 20:58:25 +0200 Received: from pd9eb2be2.dip0.t-ipconnect.de ([217.235.43.226]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 10 Oct 2014 20:58:25 +0200 Received: from Stromeko by pd9eb2be2.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 10 Oct 2014 20:58:25 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org 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