From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Git transition checklist Date: Wed, 08 Jan 2014 22:19:52 +0200 Message-ID: <83vbxudy53.fsf@gnu.org> References: <20140108135200.8ECF9380834@snark.thyrsus.com> <1738kywelh.fsf@fencepost.gnu.org> <20140108200216.GB5374@thyrsus.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1389212418 7834 80.91.229.3 (8 Jan 2014 20:20:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Jan 2014 20:20:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: esr@thyrsus.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 08 21:20:24 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W0zbz-0000Et-S3 for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 21:20:23 +0100 Original-Received: from localhost ([::1]:48801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0zbz-0001ie-Ee for ged-emacs-devel@m.gmane.org; Wed, 08 Jan 2014 15:20:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0zbh-0001NR-5b for emacs-devel@gnu.org; Wed, 08 Jan 2014 15:20:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0zbb-0001UU-AL for emacs-devel@gnu.org; Wed, 08 Jan 2014 15:20:05 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:54207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0zbb-0001U5-2F; Wed, 08 Jan 2014 15:19:59 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MZ300M00N335Y00@a-mtaout20.012.net.il>; Wed, 08 Jan 2014 22:19:57 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZ300LBAN59Z470@a-mtaout20.012.net.il>; Wed, 08 Jan 2014 22:19:57 +0200 (IST) In-reply-to: <20140108200216.GB5374@thyrsus.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:167805 Archived-At: > Date: Wed, 8 Jan 2014 15:02:16 -0500 > From: "Eric S. Raymond" > Cc: emacs-devel@gnu.org > > > What is the equivalent of bzr commit --fixes? > > There isn't one. If you want to associate a bug with a commit you'll > have to do it manually in the commit comment. It would be nice to have something similar to --fixes, so that the bug report is mentioned in the commit's metadata in some canonical format, which will then make it easy to look for that. > > Is there a changelog_merge equivalent? > > Not directly in git as far as I know. Yes, there is: in gnulib. It's called git-merge-changelog. The problem that (AFAIK) there's no distribution of it you can download; one needs to produce a gnulib module for it, and then configure and build it. > > The current version deliberately avoids calling an external executable > > during dumping of Emacs, because that seemed safer to me (one less point > > of failure). I think a git version should do the same (but I expect to > > hear it's impossible). > > I don't know of a way to do it. How about looking in .git/logs/HEAD? > I don't want to do these things in advance because the less time I > spend typing bzr commands the better. Keeping track of the branch/repo > distinction and when I have to utter which kind of invocation makes > my head hurt. Latest bzr versions support colocated branches, if you cannot live without that. (Frankly, in Emacs this makes little sense.)