From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Fri, 24 Aug 2007 12:08:30 +0200 Message-ID: <86ps1dw8gx.fsf@lola.quinscape.zz> References: <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu> <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu> <87lkc3qe2z.fsf@jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1187950267 29242 80.91.229.12 (24 Aug 2007 10:11:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 24 Aug 2007 10:11:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Leo Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 24 12:11:02 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 1IOW84-0004kF-Og for ged-emacs-devel@m.gmane.org; Fri, 24 Aug 2007 12:11:01 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOW82-0005I4-QB for ged-emacs-devel@m.gmane.org; Fri, 24 Aug 2007 06:10:58 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IOW5m-0003Yk-Lz for emacs-devel@gnu.org; Fri, 24 Aug 2007 06:08:38 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IOW5k-0003Xd-7B for emacs-devel@gnu.org; Fri, 24 Aug 2007 06:08:37 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOW5j-0003XJ-24 for emacs-devel@gnu.org; Fri, 24 Aug 2007 06:08:35 -0400 Original-Received: from pc3.berlin.powerweb.de ([62.67.228.11]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IOW5h-0003ol-OX for emacs-devel@gnu.org; Fri, 24 Aug 2007 06:08:34 -0400 Original-Received: from quinscape.de (dslnet.212-29-44.ip210.dokom.de [212.29.44.210] (may be forged)) by pc3.berlin.powerweb.de (8.9.3p3/8.9.3) with ESMTP id MAA11295 for ; Fri, 24 Aug 2007 12:08:27 +0200 X-Delivered-To: Original-Received: (qmail 22848 invoked from network); 24 Aug 2007 10:08:30 -0000 Original-Received: from unknown (HELO lola.quinscape.zz) ([10.0.3.43]) (envelope-sender ) by ns.quinscape.de (qmail-ldap-1.03) with SMTP for ; 24 Aug 2007 10:08:30 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id 4DF578FA33; Fri, 24 Aug 2007 12:08:30 +0200 (CEST) User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (gnu/linux) X-Detected-Kernel: Linux 2.4-2.6 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:77087 Archived-At: Leo writes: > On 2007-08-24 09:01 +0100, joakim@verona.se wrote: >> I am motivated to get the mtty functionality into emacs core, even >> if I wouldn't do the merging this way myself. (I hope the mtty >> history wont be lost this way, that would really not be very good) > > Many people would be grateful for your effort ;) > > Maybe this merging difficulty can be avoided in future. I see one > option for Emacs -- GIT=B9. > > Footnotes:=20 > =B9 http://git.or.cz/ But git will not do the kind of ChangeLog munging that is asked for here. On the other hand, git maintains logs and merge history with author/committer distinction (particularly important for merges). One could likely just stop using ChangeLog files at all, or generate them on-demand (for example, to put into the tarball). --=20 David Kastrup