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 04:37:24 +0200 Message-ID: <87r5pqkc63.fsf@kobe.laptop> References: <20100115222724.GB1931@muc.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263609469 18305 80.91.229.12 (16 Jan 2010 02:37:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 02:37:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 03:37:42 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 1NVyXl-0007CA-CV for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 03:37:41 +0100 Original-Received: from localhost ([127.0.0.1]:43257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVyXm-0006Id-6C for ged-emacs-devel@m.gmane.org; Fri, 15 Jan 2010 21:37:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVyXg-0006Ho-7M for emacs-devel@gnu.org; Fri, 15 Jan 2010 21:37:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVyXa-0006Cs-Db for emacs-devel@gnu.org; Fri, 15 Jan 2010 21:37:34 -0500 Original-Received: from [199.232.76.173] (port=52811 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVyXa-0006Cm-A6 for emacs-devel@gnu.org; Fri, 15 Jan 2010 21:37:30 -0500 Original-Received: from poseidon.ceid.upatras.gr ([150.140.141.169]:35451) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVyXZ-0001dX-M5 for emacs-devel@gnu.org; Fri, 15 Jan 2010 21:37:30 -0500 Original-Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 40886EB4889; Sat, 16 Jan 2010 04:37:27 +0200 (EET) Original-Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 24FAC160F6D; Sat, 16 Jan 2010 04:37:27 +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 MG3mZt80U+yW; Sat, 16 Jan 2010 04:37:27 +0200 (EET) Original-Received: from kobe.laptop (ppp-94-64-228-146.home.otenet.gr [94.64.228.146]) by mail.ceid.upatras.gr (Postfix) with ESMTP id D10AD160F68; Sat, 16 Jan 2010 04:37:26 +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 o0G2bQUT044064 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 16 Jan 2010 04:37:26 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id o0G2bPuB043886; Sat, 16 Jan 2010 04:37:25 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) In-Reply-To: <20100115222724.GB1931@muc.de> (Alan Mackenzie's message of "Fri, 15 Jan 2010 22:27:24 +0000") 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:120083 Archived-At: On Fri, 15 Jan 2010 22:27:24 +0000, Alan Mackenzie wrote: > Hi, Emacs, > > I've been struggling with this fine distributed version control system > for over a week now. My trouble is that I have no mental picture of > what the main bits are in bzr and what the relationships between them > are. I don't find the bazaar documentation much help in forming such a > mental picture. > > Specific problem: I have just fixed a bug in my "quickfixes" branch. > This involved changing a single C file and .../src/ChangeLog. I > attempt to merge the change into my "trunk" branch by doing this: > > ~/emacs/emacs.bzr/quickfixes$ bzr merge > > I get this error message: > > bzr: ERROR: Working tree "/home/acm/emacs/emacs.bzr/quickfixes/" has > uncommitted changes (See bzr status). > > 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? The "pending merge" message means that in the past (before you made the quick fix to the two files) you did: bzr merge This pulled stuff from the local trunk branch, and merged it with your local quickfixes branch. But you have to also run "bzr commit" to complete the fix. You didn't at the time, so the quickfixes branch remains in a "the merge has locally finished but it is uncommitted" state. 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". HTH, Giorgos