From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Romain Francoise Newsgroups: gmane.emacs.devel Subject: Re: Header lines of commit messages Date: Sat, 26 Jun 2010 15:33:56 +0200 Organization: orebokech dot com Message-ID: <87k4pldikb.fsf@elegiac.orebokech.com> References: <83r5jucbvq.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1277559262 2298 80.91.229.12 (26 Jun 2010 13:34:22 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 26 Jun 2010 13:34:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 26 15:34:19 2010 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.69) (envelope-from ) id 1OSVWT-0001Y7-G1 for ged-emacs-devel@m.gmane.org; Sat, 26 Jun 2010 15:34:17 +0200 Original-Received: from localhost ([127.0.0.1]:46794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSVWS-0000bT-D4 for ged-emacs-devel@m.gmane.org; Sat, 26 Jun 2010 09:34:16 -0400 Original-Received: from [140.186.70.92] (port=59335 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSVWL-0000bE-VN for emacs-devel@gnu.org; Sat, 26 Jun 2010 09:34:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OSVWK-0006uV-DQ for emacs-devel@gnu.org; Sat, 26 Jun 2010 09:34:09 -0400 Original-Received: from smtp6-g21.free.fr ([212.27.42.6]:54008) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSVWH-0006tk-IU; Sat, 26 Jun 2010 09:34:06 -0400 Original-Received: from elegiac.orebokech.com (unknown [82.67.41.165]) by smtp6-g21.free.fr (Postfix) with ESMTP id 9F1A5E080D1; Sat, 26 Jun 2010 15:33:57 +0200 (CEST) Original-Received: by elegiac.orebokech.com (Postfix, from userid 1000) id 49F05605E4; Sat, 26 Jun 2010 15:33:56 +0200 (CEST) X-Face: }9mYu,e_@+e!`Z-P5kVXa3\_b:hdJ"B)ww[&=b<2=awG:GOIM (Eli Zaretskii's message of "Sat, 26 Jun 2010 13:43:37 +0300") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:126434 Archived-At: Eli Zaretskii writes: > The header line that summarizes the commit conveys useless > information. It should state the essence of the change instead, so > that people who use "bzr log --line" will be able to grasp the purpose > of the change without looking at the full text. For changes that are made directly in Emacs, yes. In this case, org-mode is maintained outside Emacs and I'm just merging a fix from the original repository. If we followed the logic that the header line should always accurately describe the change, we wouldn't allow commits like these either: 100593: Romain Francoise 2010-06-12 Synch with Gnus trunk. 100575: Katsumi Yamaoka 2010-06-10 [merge] Synch with Gnus trunk. 100541: Katsumi Yamaoka 2010-06-07 [merge] Synch with Gnus trunk. 100498: Katsumi Yamaoka 2010-06-02 [merge] Synch with Gnus trunk. 100428: Ryan Yeske 2010-05-24 rcirc update. 100277: Katsumi Yamaoka 2010-05-14 [merge] Synch with Gnus trunk. 100255: Katsumi Yamaoka 2010-05-13 [merge] Synch with Gnus trunk. 100243: Katsumi Yamaoka 2010-05-12 [merge] Synch with Gnus trunk. 100228: Katsumi Yamaoka 2010-05-11 [merge] Synch with Gnus trunk. 100214: Katsumi Yamaoka 2010-05-10 [merge] Synch with Gnus trunk. 100180: Katsumi Yamaoka 2010-05-07 [merge] Synch with Gnus trunk. 100160: Katsumi Yamaoka 2010-05-06 [merge] Synch with Gnus trunk. 99989: Katsumi Yamaoka 2010-04-22 [merge] Synch with Gnus trunk: 99727: Katsumi Yamaoka 2010-03-23 [merge] Synch with Gnus trunk 98224: Katsumi Yamaoka 2009-10-19 Synch with Gnus trunk: 97798: Katsumi Yamaoka 2009-09-28 Synch with Gnus trunk. 97797: Katsumi Yamaoka 2009-09-28 Synch with Gnus trunk. 96612: Katsumi Yamaoka 2009-07-17 Synch with Gnus trunk: 96020: Katsumi Yamaoka 2009-06-08 Synch with Gnus trunk: 83292: Michael Albinus 2007-12-23 Sync with Tramp 2.1.12. 81049: Michael Albinus 2007-10-10 Sync with Tramp 2.1.11. 78711: Michael Albinus 2007-07-22 Sync with Tramp 2.1.10. 74948: Michael Albinus 2006-12-30 Sync with Tramp 2.0.55. 72532: Michael Albinus 2006-08-29 Sync with Tramp 2.0.54. Instead we'd ask people to replay each logical change from the original repository in Emacs, and we'd always have meaningful header lines. > The info about the commit number, if it's deemed to be important, > should be in the body of the commit message, not in the header > line. It's a merge. Where it came from is just as important as what it does, and the fact that it's a single commit rather than a bunch of unrelated changes doesn't really change anything. In an ideal world Emacs would be using Git, and org-mode, Gnus, ERC and others would just be submodules pointing to a given branch of the original repository. Then doing such a merge would not lose information. But we're stuck with bzr + patch.