From: Paul Eggert <eggert@cs.ucla.edu>
To: David Engster <deng@randomsample.de>, Glenn Morris <rgm@gnu.org>
Cc: kfogel@red-bean.com, edward.steere@gmail.com,
Eli Zaretskii <eliz@gnu.org>,
stephen_leake@stephe-leake.org, emacs-devel@gnu.org
Subject: Re: CEDET Merge
Date: Sun, 22 Jan 2017 17:37:18 -0800 [thread overview]
Message-ID: <df552679-6927-186c-e738-d5f7a8bcce00@cs.ucla.edu> (raw)
In-Reply-To: <8760l63gd9.fsf@engster.org>
David Engster wrote:
> Yes, that's a problem with long-living feature branches. It'd be nice if
> 'make ChangeLog' would use the commit date of the merge commit for all
> commits that entered Emacs through a branch merge.
As I understand it, that's not easy since git does not prefer one branch to the
other in a merge, so any scheme we come up with will be as likely to redate
commits already in the master as to redate commits entering through the merge.
> If that isn't easily possible, the person who does the merge could do a
> filter-branch before merging, setting GIT_COMMITTER_DATE to the current
> date
Something like that should work. We aren't doing that now, which causes problems
like the confusion noted.
>(if 'make ChangeLog' would actually use the committer date, which
> AFAICS it currently does not).
gitlog-to-changelog uses %ct, not %at, for its 'git log' format, so 'make
ChangeLog' should already be using committer date.
next prev parent reply other threads:[~2017-01-23 1:37 UTC|newest]
Thread overview: 153+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 19:32 CEDET Merge Edward John Steere
2017-01-12 19:45 ` Eli Zaretskii
2017-01-12 20:27 ` Edward John Steere
2017-01-12 20:10 ` Bastian Beischer
2017-01-12 20:40 ` Edward John Steere
2017-01-16 18:45 ` Edward John Steere
2017-01-16 19:30 ` Eli Zaretskii
2017-01-16 19:55 ` Edward John Steere
2017-01-16 20:06 ` Eli Zaretskii
2017-01-16 20:12 ` Edward John Steere
2017-01-17 15:59 ` Eli Zaretskii
2017-01-17 16:10 ` Edward John Steere
2017-01-17 16:36 ` Stephen Leake
2017-01-17 20:36 ` Edward John Steere
2017-01-17 21:22 ` Stephen Leake
2017-01-17 21:23 ` David Engster
2017-01-18 10:12 ` Edward Steere
2017-01-18 22:05 ` David Engster
2017-01-19 18:01 ` Edward John Steere
2017-01-19 21:57 ` David Engster
2017-01-19 22:29 ` Karl Fogel
2017-01-20 22:20 ` David Engster
2017-01-20 22:40 ` Stefan Monnier
2017-01-20 22:57 ` David Engster
2017-01-21 0:08 ` Stefan Monnier
2017-01-21 12:02 ` Eli Zaretskii
2017-01-21 18:29 ` Glenn Morris
2017-01-21 18:37 ` Eli Zaretskii
2017-01-21 18:52 ` Glenn Morris
2017-01-21 19:50 ` Eli Zaretskii
2017-01-21 22:57 ` Paul Eggert
2017-01-22 16:08 ` Eli Zaretskii
2017-01-22 22:00 ` David Engster
2017-01-23 1:37 ` Paul Eggert [this message]
2017-01-22 21:31 ` David Engster
2017-01-24 19:02 ` Edward John Steere
2017-01-26 19:54 ` Edward John Steere
2017-01-26 21:06 ` David Engster
2017-01-27 4:38 ` Edward Steere
2017-01-27 20:20 ` Edward John Steere
2017-01-27 21:04 ` David Engster
2017-01-28 9:23 ` Edward John Steere
2017-01-29 21:34 ` David Engster
2017-01-31 16:51 ` Lars Ingebrigtsen
2017-01-31 18:48 ` Ted Zlatanov
2017-01-28 13:45 ` Edward John Steere
2017-01-17 21:10 ` David Engster
2017-01-17 21:25 ` Stephen Leake
2017-01-16 20:26 ` David Engster
2017-01-16 20:37 ` Edward John Steere
2017-01-16 21:13 ` David Engster
2017-01-17 5:21 ` Edward Steere
2017-01-17 21:06 ` David Engster
2017-01-17 21:19 ` Dmitry Gutov
2017-01-17 21:32 ` David Engster
2017-01-18 3:10 ` Lee Hinman
2017-01-18 5:31 ` Edward John Steere
2017-01-18 12:58 ` Stephen Leake
2017-01-18 21:57 ` David Engster
2017-01-19 17:51 ` Edward John Steere
2017-01-19 20:25 ` Lee Hinman
2017-01-29 19:25 ` John Wiegley
2017-01-21 18:06 ` Eric Ludlam
2017-09-23 11:38 ` Charles A. Roelli
2017-09-23 12:55 ` Edward John Steere
2017-09-24 8:24 ` Charles A. Roelli
-- strict thread matches above, loose matches on Subject: below --
2017-09-26 18:31 Edward John Steere
2012-10-02 2:44 CEDET merge Dmitry Gutov
2012-10-02 5:05 ` Chong Yidong
2012-10-02 5:56 ` David Engster
2012-09-16 1:55 Feature freeze on October 1 Chong Yidong
2012-09-16 15:30 ` David Engster
2012-09-16 19:04 ` Stefan Monnier
2012-09-26 20:24 ` CEDET merge (was: Feature freeze on October 1) David Engster
2012-09-30 13:55 ` CEDET merge David Engster
2012-09-30 14:10 ` David Engster
2012-09-30 18:58 ` Glenn Morris
2012-09-30 19:17 ` Paul Eggert
2012-10-01 0:16 ` Glenn Morris
2012-10-01 3:44 ` Chong Yidong
2012-10-01 11:44 ` Eric M. Ludlam
2012-10-01 15:17 ` David Engster
2012-10-01 17:48 ` Chong Yidong
2012-10-01 17:56 ` Chong Yidong
2012-10-02 15:24 ` Chong Yidong
2012-10-04 19:32 ` David Engster
2012-10-06 11:19 ` Chong Yidong
2012-10-06 11:30 ` David Engster
2012-10-06 14:24 ` Chong Yidong
2012-10-06 14:54 ` Stefan Monnier
2012-10-06 17:29 ` David Engster
2012-10-06 18:10 ` Stefan Monnier
2012-10-07 11:19 ` David Engster
2012-10-06 23:31 ` Glenn Morris
2012-10-07 1:15 ` Glenn Morris
2012-10-07 11:03 ` David Engster
2012-10-27 14:40 ` David Engster
2012-10-28 18:50 ` Glenn Morris
2012-11-17 3:23 ` Glenn Morris
2012-11-18 15:42 ` David Engster
2012-11-20 2:45 ` Glenn Morris
2012-11-21 13:09 ` Chong Yidong
2012-10-07 20:50 ` David Engster
2012-11-08 12:32 ` Alex Ott
2009-09-28 15:31 Chong Yidong
2009-09-28 17:31 ` Ulrich Mueller
2009-09-28 17:55 ` Chong Yidong
2009-09-28 18:42 ` Ulrich Mueller
2009-09-28 19:30 ` Chong Yidong
2009-09-28 20:03 ` Ulrich Mueller
2009-09-28 20:20 ` Rupert Swarbrick
2009-09-28 22:16 ` Ulrich Mueller
2009-09-28 17:47 ` Eli Zaretskii
2009-09-28 18:00 ` Eli Zaretskii
2009-09-28 18:25 ` Chong Yidong
2009-09-28 19:23 ` Eli Zaretskii
2009-09-28 19:27 ` Andreas Schwab
2009-09-28 18:20 ` Phil Hagelberg
2009-09-28 22:10 ` Chong Yidong
2009-09-28 22:25 ` Phil Hagelberg
2009-09-30 16:38 ` Phil Hagelberg
2009-09-30 17:29 ` Chong Yidong
2009-09-30 21:43 ` Phil Hagelberg
2009-10-01 1:19 ` Chong Yidong
2009-10-01 3:20 ` Phil Hagelberg
2009-10-01 5:14 ` Phil Hagelberg
2009-10-01 7:07 ` Stefan Monnier
2009-10-02 17:46 ` Phil Hagelberg
2009-09-28 19:34 ` Andreas Schwab
2009-09-28 20:20 ` Andreas Schwab
2009-09-28 20:20 ` Alan Mackenzie
2009-09-28 21:57 ` Chong Yidong
2009-09-29 4:28 ` Glenn Morris
2009-09-29 11:28 ` Eric M. Ludlam
2009-09-30 9:32 ` Juanma Barranquero
2009-09-30 18:38 ` Eli Zaretskii
2009-09-30 19:32 ` Juanma Barranquero
2009-09-30 10:29 ` Sascha Wilde
2009-10-01 10:58 ` Sascha Wilde
2009-10-01 11:38 ` Eric M. Ludlam
2009-10-01 12:51 ` Sascha Wilde
2009-10-01 16:28 ` Sascha Wilde
2009-10-03 13:07 ` Eric M. Ludlam
2009-10-03 21:01 ` Sascha Wilde
2009-10-06 16:15 ` Sascha Wilde
2009-10-06 17:51 ` Chong Yidong
2009-10-03 20:10 ` Chong Yidong
2009-10-03 20:31 ` Eric M. Ludlam
2009-10-04 1:44 ` Chong Yidong
2009-10-04 2:30 ` Eric M. Ludlam
2009-10-04 5:52 ` Chong Yidong
2009-10-01 3:58 ` Miles Bader
2009-10-01 11:31 ` Eric M. Ludlam
2009-10-01 14:48 ` Chong Yidong
2009-10-07 3:43 ` Phil Hagelberg
2009-10-07 5:37 ` Chong Yidong
2009-10-07 16:20 ` Eric M. Ludlam
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=df552679-6927-186c-e738-d5f7a8bcce00@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=deng@randomsample.de \
--cc=edward.steere@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kfogel@red-bean.com \
--cc=rgm@gnu.org \
--cc=stephen_leake@stephe-leake.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.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).