From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lennart Borgman Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 10:16:37 +0100 Message-ID: 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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1263633439 30018 80.91.229.12 (16 Jan 2010 09:17:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 09:17:19 +0000 (UTC) Cc: Giorgos Keramidas , 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:17:12 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 1NW4mN-0002fd-3D for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 10:17:11 +0100 Original-Received: from localhost ([127.0.0.1]:37846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW4mN-00074c-PZ for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 04:17:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW4mH-00073T-Fm for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:17:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW4mD-0006z7-2b for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:17:05 -0500 Original-Received: from [199.232.76.173] (port=37358 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW4mC-0006z4-ST for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:17:00 -0500 Original-Received: from mail-fx0-f228.google.com ([209.85.220.228]:62953) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW4mA-0000uX-HJ; Sat, 16 Jan 2010 04:16:58 -0500 Original-Received: by fxm28 with SMTP id 28so446705fxm.26 for ; Sat, 16 Jan 2010 01:16:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=2UWqHO/S7gy4It9NFqLMTz/QDkCiQkFD9O6rTcuJ/uI=; b=HLCeZYQkaNaH3+7FAcnXXMvpFnqbsXoHpFImhTX0DZJuo4JWWrfA4SkEXpzHW+FmQo IdCVXGoChcIgvuSmJSCyJsl5UFcuSEv5jl54BKNMz7GH9EA1cdxKPHLQ5Y0ahfGEuDJJ lDL5iactnN1vwkY9wVAa6wmCccqo7EhAsG+lA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=tY7DAGI1aCkspbyrvSdT49RBInm+Pjrh3v0rWbKpBmf0JldWFDHdmLES+bnTpym1/m gdKk/CUA7eZwoz2dIRMrsyEMQU1rwkamZll6UW2mlwYdewIFjyqB4MKa7RUvEux8we/8 PuR2duJMdgj86W78ra7ut1pZr/he0AIdEZXdk= Original-Received: by 10.239.134.13 with SMTP id 13mr379573hbx.93.1263633417199; Sat, 16 Jan 2010 01:16:57 -0800 (PST) In-Reply-To: <83k4vicwws.fsf@gnu.org> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:120099 Archived-At: On Sat, Jan 16, 2010 at 8:48 AM, Eli Zaretskii wrote: >> >> > When I execute bzr status, it gives me a list of ~55 allegedly modifie= d >> > files, finishing up with: >> > >> > =C2=A0 =C2=A0 pending merge tips: (use -v to see all merge revisions) >> > =C2=A0 =C2=A0 =C2=A0 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? =C2=A0How 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: >> >> =C2=A0 =C2=A0 bzr merge >> >> This pulled stuff from the local trunk branch, and merged it with your >> local quickfixes branch. =C2=A0But you have to also run "bzr commit" to >> complete the fix. =C2=A0You 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 do not understand. Can someone please explain to me why a bazaar user have to take care of this?