From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Fri, 24 Aug 2007 11:03:08 +0200 Message-ID: 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 1187946222 16193 80.91.229.12 (24 Aug 2007 09:03:42 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 24 Aug 2007 09:03:42 +0000 (UTC) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 24 11:03:25 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 1IOV4b-0005fH-2x for ged-emacs-devel@m.gmane.org; Fri, 24 Aug 2007 11:03:21 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOV4Z-0007rt-4R for ged-emacs-devel@m.gmane.org; Fri, 24 Aug 2007 05:03:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IOV4S-0007pB-Mt for emacs-devel@gnu.org; Fri, 24 Aug 2007 05:03:12 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IOV4Q-0007la-Ff for emacs-devel@gnu.org; Fri, 24 Aug 2007 05:03:11 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOV4Q-0007lS-CP for emacs-devel@gnu.org; Fri, 24 Aug 2007 05:03:10 -0400 Original-Received: from proxy1.bredband.net ([195.54.101.71]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IOV4P-0006wy-M3 for emacs-devel@gnu.org; Fri, 24 Aug 2007 05:03:09 -0400 Original-Received: from kurono.home (83.227.131.3) by proxy1.bredband.net (7.3.127) id 46CDAD4E000324B9 for emacs-devel@gnu.org; Fri, 24 Aug 2007 11:03:08 +0200 In-Reply-To: (Leo's message of "Fri\, 24 Aug 2007 09\:46\:34 +0100") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1.50 (gnu/linux) X-Detected-Kernel: Genre and OS details not recognized. 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:77080 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. The way I'm used to working, there wouldnt be much of a "changelog" at all, that information would be extracted from a SCM. But I think even CVS would be able to create changelogs directly from the commits the way Emacs maintainers wants it, so I dont see what switching to git would change in this regard. Its more of a cultural issue. (git would of course bring us many other benefits) > Footnotes:=20 > =B9 http://git.or.cz/--=20 > Leo (GPG Key: 9283AA3F) --=20 Joakim Verona