From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Thu, 23 Aug 2007 03:19:16 +0300 Organization: JURTA Message-ID: <87lkc3qe2z.fsf@jurta.org> 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 1187829624 29192 80.91.229.12 (23 Aug 2007 00:40:24 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 23 Aug 2007 00:40:24 +0000 (UTC) Cc: dann@ics.uci.edu, emacs-devel@gnu.org, karoly@lorentey.hu, miles@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 23 02:40: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 1IO0kG-0002vL-5v for ged-emacs-devel@m.gmane.org; Thu, 23 Aug 2007 02:40:20 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IO0kF-0002D1-MD for ged-emacs-devel@m.gmane.org; Wed, 22 Aug 2007 20:40:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IO0kC-0002BF-AM for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:40:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IO0kA-00028o-Rb for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:40:15 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IO0kA-00028i-J6 for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:40:14 -0400 Original-Received: from relay02.kiev.sovam.com ([62.64.120.197]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IO0k9-0001QY-8H; Wed, 22 Aug 2007 20:40:13 -0400 Original-Received: from [83.170.232.243] (helo=smtp.svitonline.com) by relay02.kiev.sovam.com with esmtp (Exim 4.67) (envelope-from ) id 1IO0k4-0001KL-Ls; Thu, 23 Aug 2007 03:40:11 +0300 In-Reply-To: (Stefan Monnier's message of "Wed\, 22 Aug 2007 11\:33\:59 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-Scanner-Signature: 233cb89e4cdd9c68f6fe52a505261b56 X-DrWeb-checked: yes X-SpamTest-Envelope-From: juri@jurta.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 1396 [August 22 2007] X-SpamTest-Info: helo_type=3 X-SpamTest-Info: {HEADERS: header Content-Type found without required header Content-Transfer-Encoding} X-SpamTest-Method: none X-SpamTest-Rate: 10 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0255], KAS30/Release X-Detected-Kernel: FreeBSD 4.8-5.1 (or MacOS X 10.2-10.3) 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:77001 Archived-At: >> 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/