From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: Re: GNU Emacs is on Bazaar now. Date: Mon, 28 Dec 2009 17:07:37 +0900 Message-ID: References: <87d4206n80.fsf@canonical.com> <87637r610w.fsf@red-bean.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1261987742 8096 80.91.229.12 (28 Dec 2009 08:09:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Dec 2009 08:09:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 28 09:08:54 2009 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 1NPAer-0003KU-G3 for ged-emacs-devel@m.gmane.org; Mon, 28 Dec 2009 09:08:53 +0100 Original-Received: from localhost ([127.0.0.1]:52960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPAer-0002jd-LK for ged-emacs-devel@m.gmane.org; Mon, 28 Dec 2009 03:08:53 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NPAeG-0002gB-L2 for emacs-devel@gnu.org; Mon, 28 Dec 2009 03:08:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NPAeB-0002f9-I5 for emacs-devel@gnu.org; Mon, 28 Dec 2009 03:08:15 -0500 Original-Received: from [199.232.76.173] (port=56956 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPAeA-0002et-Sv for emacs-devel@gnu.org; Mon, 28 Dec 2009 03:08:11 -0500 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:61753) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NPAe5-00082U-Lo for emacs-devel@gnu.org; Mon, 28 Dec 2009 03:08:10 -0500 Original-Received: from rqsmtp1.aist.go.jp (rqsmtp1.aist.go.jp [150.29.254.115]) by mx1.aist.go.jp with ESMTP id nBS87cLu018729; Mon, 28 Dec 2009 17:07:44 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp1.aist.go.jp by rqsmtp1.aist.go.jp with ESMTP id nBS87cZU012272; Mon, 28 Dec 2009 17:07:38 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp1.aist.go.jp with ESMTP id nBS87bwb023932; Mon, 28 Dec 2009 17:07:37 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken with local (Exim 4.69) (envelope-from ) id 1NPAdd-0001BM-Pu; Mon, 28 Dec 2009 17:07:37 +0900 In-Reply-To: <87637r610w.fsf@red-bean.com> (message from Karl Fogel on Mon, 28 Dec 2009 01:55:11 -0500) X-detected-operating-system: by monty-python.gnu.org: Solaris 9 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:118851 Archived-At: Thank you for the quick responce. In article <87637r610w.fsf@red-bean.com>, Karl Fogel writes: > Kenichi Handa writes: >>> In case you missed it: GNU Emacs is on Bazaar now. Please see >>> http://www.emacswiki.org/emacs/BzrForEmacsDevs for how to (re)obtain >>> your development sources from Bazaar. > > > > I followed that page and created "quickfixex" branch. Then, > > I editted src/ChangeLog to add entries I forgot last time, > > saved the file, and typed C-x v v C-c C-c. Then I noticed > > that "C-x v v C-c C-c" is enough to commit in CVS, but > > perhaps not in Bazaar. The above wiki page doesn't describe > > what to do from Emacs to finish committing. Should I do > > this manually? > > > > % bzr commit -m 'Add entries in ChangeLog' > You should do whatever the wiki page says; it is written from a > command-line perspective. It says "Now you start editing. When you are done:". For my finger, "when you are done" meant "C-x C-s C-x v v C-c C-c" in CVS and VC, and it was done before I realize that I'm now in Bazaar. :-( > (I don't know what directory you intend the > above to run in, so I can't answer your question as asked. I'm now in "emacs/quickfixes" directory. > The idea is > that you should merge your change from quickfixes to trunk, then commit > trunk -- since trunk is bound to upstream, the commit there will push > the changes to the upstream master.) Hmmm, ok, by follwoing the wiki page, I did these: % bzr commit -m 'Add new entries to ChangeLog' % cd ../trunk % bzr pull % bzr merge ../quickfixes % bzr commit -m 'Merge: add new entries to ChangeLog' I hope that is the right way. But I have two questiongs. Why do I need to supply similar comments twice? Is it the convention to follow that the second comment starts with "Merge: ..."? In CVS age, we don't add comments for changes of ChangeLog file. But bzr claims as below: bzr: ERROR: empty commit message specified when I do something like "% bzr commit -m ''". Isn't it avoidable? > Anyone should go ahead and document the VC commands if they know them, > by the way. I appreciate such a work very much. The above procedure is toooo annoying compared with the C-x v v C-c C-c in CVS age. --- Kenichi Handa handa@m17n.org