Re: export to odt: error in style.xml

[Rasmus <rasmus@gmx.us>]

Hi,

Achim Gratz <Stromeko@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 <bzg@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