From: Juri Linkov <juri@jurta.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: dann@ics.uci.edu, emacs-devel@gnu.org, karoly@lorentey.hu, miles@gnu.org
Subject: Re: merging etc
Date: Thu, 23 Aug 2007 03:19:16 +0300 [thread overview]
Message-ID: <87lkc3qe2z.fsf@jurta.org> (raw)
In-Reply-To: <jwvir77io0q.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Wed\, 22 Aug 2007 11\:33\:59 -0400")
>> Richard also said he wants the multi-tty changelogs "crunched" before
>> merging -- i.e., essentially replacing many historical entries for a
>> given function/variable by a single entry for it with all the changes
>> (or in the case of a new function/variable, all entries for it except
>> "New function/variable" can be dropped entirely). I'm not sure how
>> this is supposed to work for multiple authors changing the same
>> function.... (one changelog entry per author?).
>
>> That seems like a daunting task given the size of the logs though...
>
> I actually would rather keep the whole uncrunched text. I know it can be
> found on the branch, but if we insist on putting more than just "merge from
> branch", then we may as well keep it all.
And maybe after adding ChangeLog entries from multy-tty to the trunk's
ChangeLog to change all dates (without crunching changelog entries) to the
date of sync with the trunk. This will look as all multy-tty changes were
made on the same day and won't break the chronology in ChangeLog.
--
Juri Linkov
http://www.jurta.org/emacs/
next prev parent reply other threads:[~2007-08-23 0:19 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-19 3:17 merging etc Miles Bader
[not found] ` <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu>
[not found] ` <buo3aycknp8.fsf@dhapc248.dev.necel.com>
[not found] ` <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu>
[not found] ` <fc339e4a0708220237v3b90ec6fwde90eba1ca936e91@mail.gmail.com>
2007-08-22 11:55 ` Miles Bader
2007-08-22 15:33 ` Stefan Monnier
2007-08-23 0:19 ` Juri Linkov [this message]
2007-08-23 20:58 ` Richard Stallman
2007-08-24 8:01 ` joakim
2007-08-24 8:37 ` Miles Bader
2007-08-24 8:46 ` Leo
2007-08-24 9:03 ` joakim
2007-08-25 4:07 ` Richard Stallman
2007-08-25 12:45 ` joakim
2007-08-26 2:08 ` Glenn Morris
2007-08-26 2:16 ` gnus inserts headers in body [was Re: merging etc] Glenn Morris
2007-08-26 7:45 ` gnus inserts headers in body Reiner Steib
2007-08-27 1:32 ` Glenn Morris
2007-08-27 5:11 ` David Kastrup
2007-08-26 14:56 ` merging etc Richard Stallman
2007-08-25 19:12 ` Glenn Morris
2007-08-26 1:08 ` Richard Stallman
2007-08-27 5:46 ` Miles Bader
2007-08-24 10:08 ` David Kastrup
2007-08-24 10:41 ` Bootstrap error B. Anyos
2007-08-25 4:07 ` merging etc Richard Stallman
2007-08-23 20:58 ` Richard Stallman
2007-08-23 21:10 ` Stefan Monnier
2007-08-24 16:10 ` Richard Stallman
2007-08-24 17:39 ` Stefan Monnier
2007-08-25 4:06 ` Richard Stallman
2007-08-25 4:22 ` Dan Nicolaescu
2007-08-25 19:17 ` Glenn Morris
2007-08-26 1:08 ` Richard Stallman
2007-08-23 0:45 ` Richard Stallman
2007-08-26 1:05 ` Glenn Morris
2007-08-26 2:02 ` Glenn Morris
2007-08-26 22:47 ` Richard Stallman
2007-08-26 14:56 ` Richard Stallman
2007-08-26 15:53 ` Dan Nicolaescu
2007-08-26 15:51 ` Dan Nicolaescu
[not found] ` <200708290403.l7T43TS6023420@oogie-boogie.ics.uci.edu>
[not found] ` <buoy7fvugg5.fsf@dhapc248.dev.necel.com>
[not found] ` <200708290425.l7T4P4TC023875@oogie-boogie.ics.uci.edu>
[not found] ` <buosl63uf83.fsf@dhapc248.dev.necel.com>
[not found] ` <fc339e4a0708282238q7f45a4ffsb11b27b6c1f6701a@mail.gmail.com>
2007-08-29 13:33 ` Juanma Barranquero
2007-09-13 9:31 ` Juanma Barranquero
2007-09-13 9:48 ` Jason Rumney
2007-09-13 18:51 ` Glenn Morris
2007-08-29 16:12 ` Romain Francoise
2007-08-29 16:17 ` Leo
2007-08-30 7:14 ` Richard Stallman
2007-08-30 8:16 ` joakim
2007-08-30 12:37 ` Stefan Monnier
2007-08-30 12:57 ` David Kastrup
2007-08-30 13:02 ` joakim
2007-08-30 19:56 ` Stefan Monnier
2007-08-31 7:36 ` Richard Stallman
2007-08-30 20:58 ` Eli Zaretskii
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=87lkc3qe2z.fsf@jurta.org \
--to=juri@jurta.org \
--cc=dann@ics.uci.edu \
--cc=emacs-devel@gnu.org \
--cc=karoly@lorentey.hu \
--cc=miles@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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).