From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Wed, 22 Aug 2007 11:33:59 -0400 Message-ID: References: <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu> <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1187796985 17739 80.91.229.12 (22 Aug 2007 15:36:25 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 22 Aug 2007 15:36:25 +0000 (UTC) Cc: Juri Linkov , Dan Nicolaescu , Karoly Lorentey , Emacs-Devel To: "Miles Bader" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 22 17:36:21 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1INsFi-0005Zl-Qd for ged-emacs-devel@m.gmane.org; Wed, 22 Aug 2007 17:36:15 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1INsFi-0008R9-1Q for ged-emacs-devel@m.gmane.org; Wed, 22 Aug 2007 11:36:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1INsFe-0008Nf-2P for emacs-devel@gnu.org; Wed, 22 Aug 2007 11:36:10 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1INsFc-0008Jp-Fs for emacs-devel@gnu.org; Wed, 22 Aug 2007 11:36:09 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1INsFc-0008JZ-BF for emacs-devel@gnu.org; Wed, 22 Aug 2007 11:36:08 -0400 Original-Received: from tomts36.bellnexxia.net ([209.226.175.93] helo=tomts36-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1INsFa-00020Q-Vx; Wed, 22 Aug 2007 11:36:07 -0400 Original-Received: from ceviche.home ([65.94.146.82]) by tomts36-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20070822153605.XCCL7033.tomts36-srv.bellnexxia.net@ceviche.home>; Wed, 22 Aug 2007 11:36:05 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 5039CB4123; Wed, 22 Aug 2007 11:33:59 -0400 (EDT) In-Reply-To: (Miles Bader's message of "Wed\, 22 Aug 2007 20\:55\:49 +0900") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-Detected-Kernel: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:76968 Archived-At: > Ok, I've put all the changelog info from the arch logs into > "ChangeLog.multi-tty" files in the various emacs directories (on the > multi-tty branch). I split the entries by directory and generally > cleaned up the text. Thank you very much. > 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. Stefan