From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Workflow to accumulate individual changes? Date: Fri, 01 Jan 2010 11:04:19 +0100 Message-ID: <87zl4yi1jw.fsf@telefonica.net> References: <87637of4y8.fsf@kobe.laptop> <87oclfdzs2.fsf@kobe.laptop> <87hbr6jwsy.fsf@telefonica.net> <83my0yfc9g.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262340564 1200 80.91.229.12 (1 Jan 2010 10:09:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Jan 2010 10:09:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 01 11:09:17 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.50) id 1NQeRX-0008WV-VC for ged-emacs-devel@m.gmane.org; Fri, 01 Jan 2010 11:09:16 +0100 Original-Received: from localhost ([127.0.0.1]:43831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQeRY-0007zi-Eg for ged-emacs-devel@m.gmane.org; Fri, 01 Jan 2010 05:09:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQeNS-0005Ws-4b for emacs-devel@gnu.org; Fri, 01 Jan 2010 05:05:02 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQeNM-0005TV-Jd for emacs-devel@gnu.org; Fri, 01 Jan 2010 05:05:00 -0500 Original-Received: from [199.232.76.173] (port=60204 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQeNM-0005TD-7q for emacs-devel@gnu.org; Fri, 01 Jan 2010 05:04:56 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:57120) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NQeNL-0006VX-NN for emacs-devel@gnu.org; Fri, 01 Jan 2010 05:04:56 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NQeNJ-0007Wb-A0 for emacs-devel@gnu.org; Fri, 01 Jan 2010 11:04:53 +0100 Original-Received: from 217.red-88-24-214.staticip.rima-tde.net ([88.24.214.217]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 01 Jan 2010 11:04:53 +0100 Original-Received: from ofv by 217.red-88-24-214.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 01 Jan 2010 11:04:53 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 33 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 217.red-88-24-214.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) Cancel-Lock: sha1:N6PsL919t2FL9I9CvOWOSaP1OyY= X-detected-operating-system: by monty-python.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:119194 Archived-At: Eli Zaretskii writes: >> > Is there no way to fix an error in a commit message? >> >> You can undo a commit with `bzr uncommit'. > > But the issue is not to undo the commit, only fix the text of the > commit message. Something similar to "cvs admin -mREV:MESSAGE". There is no equivalent for `cvs admin -mREV' in bazaar. Maybe it is not clear from my description that `bzr uncommit' does not throw away the change: it reverses the state to the point previous to the commit, so you do bzr uncommit bzr commit -m "the right message here" > Typos in commit messages still can happen, even with bzr ;-) AFAIK, the commit message is a part of the revision, so if bazaar allowed to simply edit it, you would be "transmuting" the revision, (i.e. it would have a different revision-id) and that is absolutely forbidden in DVCSs. What you can do is to remove some revisions and replace them with others. Just don't do it on public branches. You can change anything on the history of your private branch using a variety of techniques (being `bzr uncommit' the simplest one,) but we have to admit that changing the message of an arbitrary revision is something that can't be done due to the nature of DVCSs -- Óscar