From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: MH-E 7.4.4 checked in Date: Wed, 14 Jul 2004 18:13:45 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <20040714221345.GB27263@fencepost> References: <1890.1089689203@newt.com> <2914-Tue13Jul2004070451+0300-eliz@gnu.org> <3589.1089692661@newt.com> <2914-Tue13Jul2004215551+0300-eliz@gnu.org> <861xjfkpgu.fsf@rumba.de.uu.net> <9003-Wed14Jul2004233535+0300-eliz@gnu.org> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1089843251 23138 80.91.224.253 (14 Jul 2004 22:14:11 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 14 Jul 2004 22:14:11 +0000 (UTC) Cc: Kai Grossjohann , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Thu Jul 15 00:14:02 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Bks0o-0006Am-00 for ; Thu, 15 Jul 2004 00:14:02 +0200 Original-Received: from lists.gnu.org ([199.232.76.165]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1Bks0n-00085V-00 for ; Thu, 15 Jul 2004 00:14:01 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bks3E-0007rr-QE for emacs-devel@quimby.gnus.org; Wed, 14 Jul 2004 18:16:32 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1Bks3B-0007rc-VL for emacs-devel@gnu.org; Wed, 14 Jul 2004 18:16:30 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1Bks3B-0007rQ-Ii for emacs-devel@gnu.org; Wed, 14 Jul 2004 18:16:29 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bks3B-0007rN-Ep for emacs-devel@gnu.org; Wed, 14 Jul 2004 18:16:29 -0400 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1Bks0X-0002r9-KF for emacs-devel@gnu.org; Wed, 14 Jul 2004 18:13:45 -0400 Original-Received: from miles by fencepost.gnu.org with local (Exim 4.34) id 1Bks0X-0008AQ-7I; Wed, 14 Jul 2004 18:13:45 -0400 Original-To: Eli Zaretskii Content-Disposition: inline In-Reply-To: <9003-Wed14Jul2004233535+0300-eliz@gnu.org> User-Agent: Mutt/1.3.28i Blat: Foop 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: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:25702 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:25702 On Wed, Jul 14, 2004 at 11:35:35PM +0200, Eli Zaretskii wrote: > > What do people think about this? > > I think Miles objected to having such edits in ChangeLog. Note that my objection lies in the way that unconstrained ChangeLog edits made it harder relate the history of two branches (to the extent that you need to use ChangeLog to do so -- but a well-maintained ChangeLog is a valuable tool for this purpose, especially if you're using a non-changeset-oriented source-control system like CVS). If Kai's "system" puts well-defined merge-markers into his synthesized ChangeLogs, so you pretty much tell which changes came from where, it might also be reasonable. And of course, Kai seems committed to doing all the merging himself... :-) -Miles -- 80% of success is just showing up. --Woody Allen