emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Rasmus <rasmus@gmx.us>
To: emacs-orgmode@gnu.org
Subject: Re: export to odt: error in style.xml
Date: Tue, 14 Oct 2014 11:08:51 +0200	[thread overview]
Message-ID: <87oatff270.fsf@gmx.us> (raw)
In-Reply-To: 8738aveoqj.fsf@Rainer.invalid

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

next prev parent reply	other threads:[~2014-10-14  9:09 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20141007142000.7ec1745b@gaia>
2014-10-07 13:28 ` export to odt: error in style.xml Rasmus
2014-10-07 18:00   ` Achim Gratz
2014-10-08  0:02     ` Rasmus
2014-10-10 18:58       ` Achim Gratz
2014-10-11 12:46         ` Bastien
2014-10-14  9:08         ` Rasmus [this message]
2014-10-07 11:11 Detlef Steuer
2014-10-07 11:53 ` Rasmus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87oatff270.fsf@gmx.us \
    --to=rasmus@gmx.us \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).