From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 11:02:04 +0200 Message-ID: <87ockuv2wj.fsf@kobe.laptop> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263632553 28075 80.91.229.12 (16 Jan 2010 09:02:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 09:02:33 +0000 (UTC) Cc: acm@muc.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 10:02:25 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 1NW4Y5-00071Q-1O for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 10:02:25 +0100 Original-Received: from localhost ([127.0.0.1]:52897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW4Y5-0002mp-Jb for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 04:02:25 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW4Xx-0002mZ-7L for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:02:17 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW4Xs-0002mN-Kj for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:02:16 -0500 Original-Received: from [199.232.76.173] (port=60579 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW4Xs-0002mK-8J for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:02:12 -0500 Original-Received: from poseidon.ceid.upatras.gr ([150.140.141.169]:36224) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW4Xp-0004eQ-FE; Sat, 16 Jan 2010 04:02:09 -0500 Original-Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id AD418EB47FE; Sat, 16 Jan 2010 11:02:08 +0200 (EET) Original-Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 9B62A160F70; Sat, 16 Jan 2010 11:02:08 +0200 (EET) X-Virus-Scanned: amavisd-new at ceid.upatras.gr Original-Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I6ZHhU1ko+6Z; Sat, 16 Jan 2010 11:02:08 +0200 (EET) Original-Received: from kobe.laptop (ppp-94-64-196-193.home.otenet.gr [94.64.196.193]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 533D4160F6F; Sat, 16 Jan 2010 11:02:08 +0200 (EET) Original-Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id o0G926Un063266 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 16 Jan 2010 11:02:07 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id o0G925m8063263; Sat, 16 Jan 2010 11:02:05 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) In-Reply-To: <83k4vicwws.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Jan 2010 09:48:51 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (berkeley-unix) 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:120097 Archived-At: On Sat, 16 Jan 2010 09:48:51 +0200, Eli Zaretskii wrote: >> From: Giorgos Keramidas >> Date: Sat, 16 Jan 2010 04:37:24 +0200 >> Cc: emacs-devel@gnu.org >> >> > When I execute bzr status, it gives me a list of ~55 allegedly modified >> > files, finishing up with: >> > >> > pending merge tips: (use -v to see all merge revisions) >> > Jan D. 2010-01-06 [merge] Fix slowdown and wrong font choosed by XSETTINGS... >> > >> > Would somebody please tell me what I might have done to make bzr think >> > I've got 55 modified files? How might I recover from this? >> >> I think the easiest way to revert your local "quickfixes" branch to a >> known & sane state is something like: >> >> 1. Keep a backup of the two files you modified. >> 2. Wipe the local quickfixes branch. >> 3. Re-create the quickfixes from trunk. >> 4. Overwre the two files in the new quickfixes branch. >> 5. Use "bzr diff" to inspect the changes. >> 6. Commit them with "bzr commit". > > Why not simply > > ~/emacs/emacs.bzr/quickfixes$ bzr merge --force To be honest, because I don't know for sure what merge --force does under the hood. It sounds like it will solve the immediate problem of having a quickfixes branch half-way through a merge, but it also seems it will create a merge commit that includes both the pending merge changes *and* the small fix in the same changes. For a tiny change it will probably be easy to understand which part of the changes is a merge and which other parts are new. For larger changes I'm not sure if it will look ok in the DAG of the history, especially if the quick and small fix is very localized and will be pushed to the trunk in short order.