From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rasmus Subject: Re: export to odt: error in style.xml Date: Tue, 14 Oct 2014 11:08:51 +0200 Message-ID: <87oatff270.fsf@gmx.us> References: <20141007142000.7ec1745b@gaia> <87sij0ovoo.fsf@gmx.us> <877g0bu5en.fsf@Rainer.invalid> <87zjd71l8x.fsf@gmx.us> <8738aveoqj.fsf@Rainer.invalid> 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]:38632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xdy6V-0004nF-IV for emacs-orgmode@gnu.org; Tue, 14 Oct 2014 05:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xdy6Q-0007Mf-FU for emacs-orgmode@gnu.org; Tue, 14 Oct 2014 05:09:15 -0400 Received: from plane.gmane.org ([80.91.229.3]:55112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xdy6Q-0007MX-8y for emacs-orgmode@gnu.org; Tue, 14 Oct 2014 05:09:10 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xdy6K-0002HV-Ah for emacs-orgmode@gnu.org; Tue, 14 Oct 2014 11:09:04 +0200 Received: from 109.201.152.7 ([109.201.152.7]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 14 Oct 2014 11:09:04 +0200 Received: from rasmus by 109.201.152.7 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 14 Oct 2014 11:09:04 +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 Hi, Achim Gratz 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 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