From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: reversion revulsion [was: log format for vc-bzr] Date: Fri, 08 Jan 2010 14:36:32 +0200 Message-ID: <834omwbwof.fsf@gnu.org> References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <874oo1w9y1.fsf@telefonica.net> <87tyw1uss6.fsf@telefonica.net> <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> <87wrzszz4y.fsf_-_@ambire.localdomain> <87d41kdeqp.fsf@telefonica.net> Reply-To: Eli Zaretskii 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 1262954340 27533 80.91.229.12 (8 Jan 2010 12:39:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 12:39:00 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 13:38:53 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 1NTE7A-0000N0-Ju for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 13:38:52 +0100 Original-Received: from localhost ([127.0.0.1]:53695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTE7B-0004ii-96 for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 07:38:53 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTE6u-0004YK-OK for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:38:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTE6p-0004TU-RV for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:38:35 -0500 Original-Received: from [199.232.76.173] (port=41127 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTE6p-0004TL-Ih for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:38:31 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:63565) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NTE6p-0006Em-7h for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:38:31 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTE6o-0000ys-9i for emacs-devel@gnu.org; Fri, 08 Jan 2010 07:38:30 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0KVX00A00HISDB00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Fri, 08 Jan 2010 14:38:28 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVX008B5HS3X3E0@a-mtaout23.012.net.il>; Fri, 08 Jan 2010 14:38:28 +0200 (IST) In-reply-to: <87d41kdeqp.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by mx20.gnu.org: Solaris 10 (beta) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:119679 Archived-At: > From: =C3=93scar_Fuentes > Date: Fri, 08 Jan 2010 12:21:02 +0100 >=20 > > cd .../trunk # 0 > > bzr update # 1 > > bzr merge ../quickfixes # 2 > > bzr commit # 3 > > bzr revert --forget-merges # 4 > > > > IIUC step 3 publishes, as does step 4, defeating atomicity. >=20 > Nope, you have steps 3 and 4 reversed. I usually do it slightly differently (following the wiki): cd ../trunk bzr update cd ../quickfixes bzr merge bzr commit Where would I put "bzr revert --forget-merges" in my case? wouldn't that be after the last "commit"? > `bzr revert' does not modify committed history. As far as I understood from Juanma and Stephen, it actually does. Unless by ``committed history'' you mean something that excludes the history of merging revisions between branch and trunk. What am I missing? > Maybe you are > confusing it with `bzr uncommit', which NEVER should be used in tru= nk/? Not even if I need to revert the last commit?