From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Wed, 22 Aug 2007 20:45:21 -0400 Message-ID: References: <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu> <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu> Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1187829799 29540 80.91.229.12 (23 Aug 2007 00:43:19 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 23 Aug 2007 00:43:19 +0000 (UTC) Cc: juri@jurta.org, dann@ics.uci.edu, karoly@lorentey.hu, emacs-devel@gnu.org To: "Miles Bader" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 23 02:43:16 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 1IO0n5-0003T1-6R for ged-emacs-devel@m.gmane.org; Thu, 23 Aug 2007 02:43:15 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IO0n4-0004Ql-Ku for ged-emacs-devel@m.gmane.org; Wed, 22 Aug 2007 20:43:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IO0lB-0002xZ-EA for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:41:17 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IO0l9-0002wm-Td for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:41:17 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IO0l9-0002wh-No for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:41:15 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IO0l9-0001c0-Fk for emacs-devel@gnu.org; Wed, 22 Aug 2007 20:41:15 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1IO0p7-0000xQ-Ki; Wed, 22 Aug 2007 20:45:21 -0400 In-reply-to: (miles@gnu.org) X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) 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:77006 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 is one way to do it. That seems like a daunting task given the size of the logs though... I think that anyone here could do it in a few hours. But it doesn't have to be done all by one person. How about checking in a copy of the whole change log (since the branch was forked) in a separate file in each directory? That way, various people can contribute to simplifying it.