From: "Eli Zaretskii" <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: ChangeLog when merging from "upstream"
Date: Fri, 06 Aug 2004 12:14:02 +0300 [thread overview]
Message-ID: <9743-Fri06Aug2004121401+0300-eliz@gnu.org> (raw)
In-Reply-To: <v9hdrh5lxj.fsf@marauder.physik.uni-ulm.de> (message from Reiner Steib on Thu, 05 Aug 2004 23:12:24 +0200)
> From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de>
> Date: Thu, 05 Aug 2004 23:12:24 +0200
>
> I want to merge a change from Gnus' repository (committed after
> emacs21_4-gnus-5_10-branchpoint) into Emacs (gnus-5_10-branch).
>
> The change in Gnus is dated 2004-08-02. When I install the changes on
> 2004-08-06, should it read as follows?
>
> ,----
> | 2004-08-06 Reiner Steib <Reiner.Steib@gmx.de>
> |
> | Sync with v5_10 branch:
> |
> | 2004-08-02 Reiner Steib <Reiner.Steib@gmx.de>
> |
> | * gnus.el (gnus-group, gnus-summary, gnus-summary-sort): Fix
> | custom-manual entries.
> | [...]
> `----
No, all the dates should be changed to the date of the commit.
>
> I've seen similar non-monotonic date entries for tramp:
I think all those should be fixed so that the dates are always
monotonic.
next prev parent reply other threads:[~2004-08-06 9:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-05 21:12 ChangeLog when merging from "upstream" Reiner Steib
2004-08-06 9:14 ` Eli Zaretskii [this message]
2004-08-07 21:20 ` Richard Stallman
2004-08-10 19:47 ` Reiner Steib
2004-08-11 20:35 ` Richard Stallman
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9743-Fri06Aug2004121401+0300-eliz@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.