From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: Re: log format for vc-bzr Date: Sat, 09 Jan 2010 09:50:19 +0100 Message-ID: <873a2f1x2s.fsf@ambire.localdomain> References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <200912082203.nB8M3FLP023771@godzilla.ics.uci.edu> <87hbs1at4u.fsf@notengoamigos.org> <871vj3sxgy.fsf@telefonica.net> <87ws0vrd46.fsf@telefonica.net> <87hbqxa9ti.fsf@ambire.localdomain> <87k4vtd1uy.fsf@telefonica.net> <83ljg9as4g.fsf@gnu.org> <873a2gkh0n.fsf@uwakimon.sk.tsukuba.ac.jp> <838wc8bxft.fsf@gnu.org> <874omwd7wx.fsf@telefonica.net> <83ocl4a60j.fsf@gnu.org> <87ocl4bie4.fsf@telefonica.net> <83ljg89ypj.fsf@gnu.org> <87bph4b9z4.fsf@telefonica.net> <83d41k9tgc.fsf@gnu.org> <877hrsb704.fsf@telefonica.net> <83aawo9qws.fsf@gnu.org> <873a2gb3jk.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1263027213 13301 80.91.229.12 (9 Jan 2010 08:53:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Jan 2010 08:53:33 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 09 09:53:26 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 1NTX4W-0003Ay-1w for ged-emacs-devel@m.gmane.org; Sat, 09 Jan 2010 09:53:24 +0100 Original-Received: from localhost ([127.0.0.1]:52266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTX4W-0000tt-Gt for ged-emacs-devel@m.gmane.org; Sat, 09 Jan 2010 03:53:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTX4O-0000rg-Pv for emacs-devel@gnu.org; Sat, 09 Jan 2010 03:53:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTX4L-0000nZ-VQ for emacs-devel@gnu.org; Sat, 09 Jan 2010 03:53:16 -0500 Original-Received: from [199.232.76.173] (port=44470 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTX4L-0000nO-S8 for emacs-devel@gnu.org; Sat, 09 Jan 2010 03:53:13 -0500 Original-Received: from smtp-out113.alice.it ([85.37.17.113]:2492) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTX4L-0003OZ-EP for emacs-devel@gnu.org; Sat, 09 Jan 2010 03:53:13 -0500 Original-Received: from FBCMMO04.fbc.local ([192.168.184.135]) by smtp-out113.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Sat, 9 Jan 2010 09:53:09 +0100 Original-Received: from FBCMCL01B03.fbc.local ([192.168.69.84]) by FBCMMO04.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Sat, 9 Jan 2010 09:52:45 +0100 Original-Received: from ambire.localdomain ([79.45.74.123]) by FBCMCL01B03.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Sat, 9 Jan 2010 09:52:44 +0100 Original-Received: from ttn by ambire.localdomain with local (Exim 4.63) (envelope-from ) id 1NTX1Y-00026P-5G for emacs-devel@gnu.org; Sat, 09 Jan 2010 09:50:20 +0100 In-Reply-To: <873a2gb3jk.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Sat, 09 Jan 2010 00:05:51 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) X-OriginalArrivalTime: 09 Jan 2010 08:52:45.0180 (UTC) FILETIME=[1C7763C0:01CA9109] X-detected-operating-system: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ 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:119752 Archived-At: () =C3=93scar Fuentes () Sat, 09 Jan 2010 00:05:51 +0100 At the time you use --forget-merges the merge point still doesn't exist. It is created by the commit. So the hypothetical name for the option would be more like --commit-the-source-changes-but-do-not-create-a-merge-point It sounds like the naming error (in the option) lies with the verb "forget", which in the construction "forget X" implies X has already happened. If X is from the future, "don't bother to schedule X" is better. Another timing error is in the association of the option with the command "revert", which also has strong (by definition!) implication of undoing an action in the past. Really, the distinction the option introduces is between the data and the metadata. A "bzr merge" combines both normally, and it is there that the distinction (the message "combine only the data, not the metadata") should be moved. Concretely, the sequence: bzr merge bzr revert --forget-merges would be better expressed as: bzr merge --data-only ;; or somesuch in order to avoid having to wrap one's head around "pre-forgetting". thi