From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Fri, 24 Aug 2007 21:22:03 -0700 Message-ID: <200708250422.l7P4M36C023668@oogie-boogie.ics.uci.edu> 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 1188015873 24275 80.91.229.12 (25 Aug 2007 04:24:33 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 25 Aug 2007 04:24:33 +0000 (UTC) Cc: juri@jurta.org, miles@gnu.org, karoly@lorentey.hu, Stefan Monnier , emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 25 06:24:30 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 1IOnCH-0003BB-BP for ged-emacs-devel@m.gmane.org; Sat, 25 Aug 2007 06:24:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOnCG-00050h-OO for ged-emacs-devel@m.gmane.org; Sat, 25 Aug 2007 00:24:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IOnCD-0004z2-9o for emacs-devel@gnu.org; Sat, 25 Aug 2007 00:24:25 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IOnCC-0004xW-He for emacs-devel@gnu.org; Sat, 25 Aug 2007 00:24:24 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOnCB-0004wF-Qm for emacs-devel@gnu.org; Sat, 25 Aug 2007 00:24:24 -0400 Original-Received: from oogie-boogie.ics.uci.edu ([128.195.1.41]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IOnBz-0004jv-Cy; Sat, 25 Aug 2007 00:24:11 -0400 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id l7P4M36C023668; Fri, 24 Aug 2007 21:22:03 -0700 (PDT) In-Reply-To: (Richard Stallman's message of "Sat\, 25 Aug 2007 00\:06\:58 -0400") Original-Lines: 22 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.44, required 5, autolearn=disabled, ALL_TRUSTED -1.44) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-Detected-Kernel: Solaris 9 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:77116 Archived-At: Richard Stallman writes: > I tend to believe the opposite: the description of small changes are easier > to understand than description of combined changes. > > The usual simplification is to replace > > * foo.c (fooo_bar): Call mumble. > ... > * foo.c (fooo_bar): New function > > with > > * foo.c (fooo_bar): New function > > since (from the point of view of the trunk) the whole > thing is new. Can you please clarify, is crunching the log a blocker for the merge? Or can the merge proceed, add the logs with the dates changed to the date of the merge, and add an entry in FOR-RELEASE that the logs need to be processed?