From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Wrong commit message. What to do now? Date: Tue, 13 Jul 2010 23:42:07 -0400 Message-ID: <878w5ebugg.fsf@red-bean.com> References: <8739vndo36.fsf@red-bean.com> <87pqyrc8am.fsf@telefonica.net> <87mxtvc6pf.fsf@red-bean.com> <87vd8ihhlm.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1279078945 21526 80.91.229.12 (14 Jul 2010 03:42:25 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 14 Jul 2010 03:42:25 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 14 05:42:23 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 1OYsrU-0000fL-18 for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 05:42:20 +0200 Original-Received: from localhost ([127.0.0.1]:42503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYsrS-0002vv-JH for ged-emacs-devel@m.gmane.org; Tue, 13 Jul 2010 23:42:18 -0400 Original-Received: from [140.186.70.92] (port=43548 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYsrL-0002u8-AY for emacs-devel@gnu.org; Tue, 13 Jul 2010 23:42:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYsrJ-0007Vh-TM for emacs-devel@gnu.org; Tue, 13 Jul 2010 23:42:11 -0400 Original-Received: from osh-net-219-98.onshore.net ([66.146.219.98]:35832 helo=sanpietro.red-bean.com) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYsrJ-0007VZ-QG for emacs-devel@gnu.org; Tue, 13 Jul 2010 23:42:09 -0400 Original-Received: from localhost ([127.0.0.1]:54202 helo=floss ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.72) (envelope-from ) id 1OYsrH-0007qq-ST; Tue, 13 Jul 2010 22:42:07 -0500 In-Reply-To: <87vd8ihhlm.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Wed, 14 Jul 2010 12:23:17 +0900") 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-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:127246 Archived-At: Thanks, Stephen. Considering the options, I guess I'll go with "Always review log messages of commits you are about to push." ...and just be more careful. Subversion, though limited in other ways of course, spoiled me in this respect, and I got used to being able to un-shoot myself in the foot. -Karl "Stephen J. Turnbull" writes: >Karl Fogel writes: > > =C3=93scar Fuentes writes: > > > >> The ChangeLog is correct; just the bzr commit message is wrong. Does > > >> anyone know if there's anything that can be done about this?=20=20 > > > > > >Aren't you the guy who work on the same office as the Bazaar hackers? > >=20 > > :-) No -- I don't now, but anyway I was never co-located with them. > >=20 > > I wish I knew how to solve this mis-message problem. It's a pretty > > important use case. > >Real solution requires changing Bazaar >-------------------------------------- > >Stefan has proposed (IIRC) a solution in which the commit message is >an annotation on the commit object, rather than part of the hashed >metadata that gives the commit its identity. This fills me with >foreboding; I can expand on that, but it's "feelings" so this is not >the place. It certainly is technically workable, and might even be >backward compatible with the right implementation.[1] > >git uses a different method, adding a concept of "annotations to a >commit," which are not part of the commit's identity but are >automatically displayed by tools like "git log". AIUI, this is >backward compatible, but old git versions can't see the annotations. >I suspect this would be fairly easy to implement in Bazaar, but I >don't know anything about the relevant internals. I "like" this >approach better, but can't prove it. > >Workarounds in Bazaar >--------------------- > >Empty commit with correct log message. Do this on a branch if >necessary to associate it directly with the commit whose log needs >correction. Append "(empty commit - correction of log message)" to >the log message. If on a branch, the merge log message should be >"Correct log message of revid:stupid-bazaar-format-id-XXXXXXX." > >Duplicate commit on a branch with correct log message. This has the >potential to cause a conflict, but you'll probably get lucky. Merge >with merge log message as above. > >Tag the commit with "XXX-ignore-bogus-commit-log-use-ChangeLog" where >XXX is a uniquifier for this style of tag. > >Suggested workflow changes >-------------------------- > >Don't use bound branches. > >Always review log messages of commits you are about to push. > >Use something like Didier Verna's patcher.el to ensure that all of the >work on a particular change is done consistently. > > >Footnotes:=20 >[1] All the dodges I've thought of that make this possible are (a) >ugly and (b) mean that old Bazaar versions would not be able to >display log messages written by new Bazaar versions.