From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: merge-commits policy Date: Tue, 17 May 2011 16:50:57 -0300 Message-ID: References: <4DD0B118.1040205@cs.ucla.edu> <83pqnjdxga.fsf@gnu.org> <4DD0B70F.7090801@cs.ucla.edu> <83mxindqmp.fsf@gnu.org> <83boz1gqfs.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1305662121 1049 80.91.229.12 (17 May 2011 19:55:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 17 May 2011 19:55:21 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 17 21:55:17 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QMQML-0002SG-RB for ged-emacs-devel@m.gmane.org; Tue, 17 May 2011 21:55:13 +0200 Original-Received: from localhost ([::1]:53851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQML-0004Z9-4v for ged-emacs-devel@m.gmane.org; Tue, 17 May 2011 15:55:13 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQIK-0005am-EL for emacs-devel@gnu.org; Tue, 17 May 2011 15:51:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMQII-0003eL-Hl for emacs-devel@gnu.org; Tue, 17 May 2011 15:51:04 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:39770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQII-0003eH-Fy for emacs-devel@gnu.org; Tue, 17 May 2011 15:51:02 -0400 Original-Received: from [190.175.112.168] (port=10871 helo=ceviche.home) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QMQIH-0002k5-1j; Tue, 17 May 2011 15:51:01 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 39B5F66131; Tue, 17 May 2011 16:50:57 -0300 (ART) In-Reply-To: <83boz1gqfs.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 17 May 2011 20:57:59 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 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:139469 Archived-At: >> As would searching the ChangeLog rather than "bzr log". > Unfortunately, only some of these updates are reflected in > doc/misc/ChangeLog, and some aren't, so this is unreliable. That's a problem that needs fixing, then. >> Personally I would use C-x v l and/or C-x v g from the texinfo.tex buffer. > "C-x v l" takes ages for veteran files (because texinfo.tex was > "cvs mv"ed, it appears to have been born relatively recently, so it is > spared this problem). To be efficient, you need to run "bzr log" for > a certain range of revisions. > "C-x v g" is fine only the first time. Once you find the latest > revision that modified some line, and need to see the previous > revisions that modified the same line, you need to find the exact > revision number and use "-r before:", or else you will miss some of > the change history, e.g. if there were more than one change on the > branch before it was merged. > Like I said: possible, but harder. Yup. These are problems with Bazaar (and/or with vc-bzr.el). >> > different features and unrelated bugfixes. If you regard any "sync >> > from gnulib" as a single self-contained changeset, then at least it >> > should be committed to mainline separately from other changes. >> That would make sense, yes. Although in the case of gnulib, most >> "syncs" happen because we import yet another module, so it's OK to do >> both "import foo module" and "sync" at the same time, but indeed, the >> commit message should indicate that a sync with gnulib took place. > Thanks, I hope this is acceptable. It is. Stefan