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: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 09:48:51 +0200 Message-ID: <83k4vicwws.fsf@gnu.org> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1263628114 19293 80.91.229.12 (16 Jan 2010 07:48:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 07:48:34 +0000 (UTC) Cc: acm@muc.de, emacs-devel@gnu.org To: Giorgos Keramidas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 08:48:27 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 1NW3OT-0004Pk-Bo for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 08:48:25 +0100 Original-Received: from localhost ([127.0.0.1]:57406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW3OU-0002QQ-0a for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 02:48:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW3ON-0002Ni-Fq for emacs-devel@gnu.org; Sat, 16 Jan 2010 02:48:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW3OH-0002MS-UK for emacs-devel@gnu.org; Sat, 16 Jan 2010 02:48:18 -0500 Original-Received: from [199.232.76.173] (port=39815 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW3OH-0002MI-Oo for emacs-devel@gnu.org; Sat, 16 Jan 2010 02:48:13 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:63259) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NW3OG-00008n-Nt for emacs-devel@gnu.org; Sat, 16 Jan 2010 02:48:13 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW3OE-0007pp-V3 for emacs-devel@gnu.org; Sat, 16 Jan 2010 02:48:11 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWB00E00XLOS600@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 16 Jan 2010 09:48:09 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.60.183]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWB00E3TXO8L120@a-mtaout22.012.net.il>; Sat, 16 Jan 2010 09:48:09 +0200 (IST) In-reply-to: <87r5pqkc63.fsf@kobe.laptop> 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:120089 Archived-At: > 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? > > 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. That's probably what happened. > 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 ? Then Alan could continue with the normal quickfixes workflow: ~/emacs/emacs.bzr/quickfixes$ cd ../trunk ~/emacs/emacs.bzr/trunk$ bzr update ~/emacs/emacs.bzr/trunk$ bzr merge ../quickfixes ~/emacs/emacs.bzr/trunk$ bzr commit -m "Fixed bug #1234." Are there any problems with using --force in this case? (From the discussions on the Bazaar list, I understand that some very near future version will make "bzr merge" display a warning when there are uncommitted changes, instead of erroring out. So the above would happen for Alan anyway, in that future version.)