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: reversion revulsion Date: Fri, 08 Jan 2010 14:41:51 +0100 Message-ID: <87k4vsu31c.fsf@ambire.localdomain> References: <200912081747.nB8HlwPR021836@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> <87wrzszz4y.fsf_-_@ambire.localdomain> 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 1262958426 8995 80.91.229.12 (8 Jan 2010 13:47:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 13:47:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 14:46:58 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 1NTFAp-0005Al-8C for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 14:46:43 +0100 Original-Received: from localhost ([127.0.0.1]:42860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTFAo-0001in-8O for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 08:46:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTFAi-0001gU-8o for emacs-devel@gnu.org; Fri, 08 Jan 2010 08:46:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTFAf-0001bg-50 for emacs-devel@gnu.org; Fri, 08 Jan 2010 08:46:35 -0500 Original-Received: from [199.232.76.173] (port=54267 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTFAf-0001bX-0K for emacs-devel@gnu.org; Fri, 08 Jan 2010 08:46:33 -0500 Original-Received: from smtp-out112.alice.it ([85.37.17.112]:2558) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTFAe-00080l-HO for emacs-devel@gnu.org; Fri, 08 Jan 2010 08:46:32 -0500 Original-Received: from fbcmmo06.fbc.local ([192.168.184.137]) by smtp-out112.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Fri, 8 Jan 2010 14:46:28 +0100 Original-Received: from FBCMCL01B01.fbc.local ([192.168.69.82]) by fbcmmo06.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Fri, 8 Jan 2010 14:44:17 +0100 Original-Received: from ambire.localdomain ([79.24.23.250]) by FBCMCL01B01.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Fri, 8 Jan 2010 14:44:18 +0100 Original-Received: from ttn by ambire.localdomain with local (Exim 4.63) (envelope-from ) id 1NTF67-0008D8-JP for emacs-devel@gnu.org; Fri, 08 Jan 2010 14:41:51 +0100 In-Reply-To: (Juanma Barranquero's message of "Fri, 8 Jan 2010 11:53:40 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) X-OriginalArrivalTime: 08 Jan 2010 13:44:18.0669 (UTC) FILETIME=[ACFC39D0:01CA9068] 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:119692 Archived-At: () Juanma Barranquero () Fri, 8 Jan 2010 11:53:40 +0100 > That's just from a correctness pov. =C2=A0I dread the performance > implications of having to do (and possibly screwing up): > > cd .../trunk =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0# 0 > bzr update =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# 1 > bzr merge ../quickfixes =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # 2 > bzr commit =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# 3 > bzr revert --forget-merges =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0# 4 > > IIUC step 3 publishes, as does step 4, defeating atomicity. What would #4 do? After reading your recent reply, i believe i have misunderstood "bzr revert --forget-merges", which should be #3, bumping the "bzr commit" rightly to #4. In that case, there is no problem; we get the equivalent (almost) to what "git merge --squash" does. Cool. I suppose from a policy pov, it would be good to distinguish between "presentable" and "private" local-branch history, the former being log entries written with publishing in mind. In that case, plain "bzr merge" seems to DTRT. On the other hand, with private local-branch history (e.g., a series of log entries of the type "going to lunch", etc), something like: bzr-merge-squash () { bzr merge ; bzr log | grep INTERESTING-LOG-ENTRIES > LOG-ENTRY-INIT ; bzr revert --forget-merges ; } is more suited (followed by "bzr commit -f LOG-ENTRY-INIT"), and everyone defines INTERESTING-LOG-ENTRIES as they see fit. Am i back on the right page now? thi