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: Sat, 25 Aug 2007 14:45:41 +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=us-ascii X-Trace: sea.gmane.org 1188055970 14196 80.91.229.12 (25 Aug 2007 15:32:50 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 25 Aug 2007 15:32:50 +0000 (UTC) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 25 17:32:47 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 1IOxd0-0007NW-IY for ged-emacs-devel@m.gmane.org; Sat, 25 Aug 2007 17:32:46 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOxcz-0001xj-S7 for ged-emacs-devel@m.gmane.org; Sat, 25 Aug 2007 11:32:45 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IOxcw-0001ws-Uv for emacs-devel@gnu.org; Sat, 25 Aug 2007 11:32:43 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IOxcu-0001wG-KZ for emacs-devel@gnu.org; Sat, 25 Aug 2007 11:32:41 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOxcu-0001vt-7O for emacs-devel@gnu.org; Sat, 25 Aug 2007 11:32:40 -0400 Original-Received: from proxy2.bredband.net ([195.54.101.72]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IOv1N-0007X4-Pi for emacs-devel@gnu.org; Sat, 25 Aug 2007 08:45:46 -0400 Original-Received: from kurono.home (83.227.131.3) by proxy2.bredband.net (7.3.127) id 46CDAD5C0007BA6B for emacs-devel@gnu.org; Sat, 25 Aug 2007 14:45:42 +0200 In-Reply-To: (Richard Stallman's message of "Sat\, 25 Aug 2007 00\:07\:42 -0400") 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:77129 Archived-At: Richard Stallman writes: > 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) > > The CVS change logs are insufficient because they do not list the > authors' names. They list who checked in the change. > > So that simply is not an option. That could surely be fixed by adding meta data to the commit. But I'm not going to argue this point. Instead I would like ask if its possible to do the merge like this: - people knowledgeable how to perform the merge with the given tool contraints do so now, merging mtty to head. - In the changelog there will be a placeholder: ------- Merge performed from mtty branch: TODO insert crunched mtty changelog here. ------- - somewhere in the Emacs tree there will be a mtty changelog. - The mtty changelog is crunched piece by piece, and inserted into the main changelog incrementaly. The corresponding passage in the mtty changelog is removed to keep track of progress. I would like to do it this way so several people can work together on the crunching, and so the merging wont be delayed so people can start find actual functional problems. Furthermore I dont feel very comfortable with cvs, and this way feels less likely to mess up. -- Joakim Verona