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 11:02:50 +0100 Message-ID: References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <83d41acr32.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 1263636214 3987 80.91.229.12 (16 Jan 2010 10:03:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 10:03:34 +0000 (UTC) Cc: keramida@ceid.upatras.gr, 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 11:03:26 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 1NW5V7-0007M4-Nd for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 11:03:26 +0100 Original-Received: from localhost ([127.0.0.1]:33121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5V8-0007ON-E3 for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 05:03:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW5V1-0007OI-AR for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:03:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW5Uw-0007O1-Ig for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:03:18 -0500 Original-Received: from [199.232.76.173] (port=49222 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5Uw-0007Ny-96 for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:03:14 -0500 Original-Received: from mail-fx0-f228.google.com ([209.85.220.228]:64797) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW5Ut-0000wk-I4; Sat, 16 Jan 2010 05:03:11 -0500 Original-Received: by fxm28 with SMTP id 28so464751fxm.26 for ; Sat, 16 Jan 2010 02:03:10 -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=iXm0lg3gtqY5UST6iMBgZr29Cmlkg6HTcm4OcVtxHUU=; b=S9FLkeGlPGOcuTlpFHe9zA/gA8fhBY5Nyf6GNI0sobWA5ddJKOoDQiYn3pIDdit3oi Xk2OsBDIOvokDJwb4kRWemzIrfK2ReqHJfQS0M7P0zL+0bQM9WIXQ11z3c8L8YEZwzCq HqePiPLbSLYGcWx/d1wKV8Wm91RCx4XjZSv8g= 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=I3W+TQEe9GewnGDMRjvMtA3PzdmAdqq2I9oJ4qaIMc0i/p6O3J5IRPnG8vxc85fRcw AIW2Y1ZkNqxbxGviS1k4wf9wQ64oPmOXdco8yS0hyL/k5FwQD9deZ/03jst67vYsoxpd lvFD1HSXe5OXeCnPv6PJ1PiXCLZ3daJvaOYzU= Original-Received: by 10.239.188.11 with SMTP id n11mr387421hbh.17.1263636190119; Sat, 16 Jan 2010 02:03:10 -0800 (PST) In-Reply-To: <83d41acr32.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:120104 Archived-At: On Sat, Jan 16, 2010 at 10:54 AM, Eli Zaretskii wrote: >> >> > >> >> > Would somebody please tell me what I might have done to make bzr th= ink >> >> > 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 t= he >> >> 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 you= r >> >> 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 bra= nch >> >> 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? > > It's in the workflow described on the wiki: the process of merging a > branch with the mainline involves two commands: > > =C2=A0bzr merge > =C2=A0bzr commit > > The first one merges the text of the files, but does not combine their > histories. =C2=A0The second command finishes the merging process by > updating the history so that it now includes both local commits and > whatever happened in the mainline since the last time you merged from > it. Thanks Eli, but what worries me is that it looks like one could take a completely wrong path here after "bzr merge". I might be misunderstanding something but it looks to me like Alan's quick fix branch got into a bad state just because he did not do "bzr commit" immediately. Is that really true??? If so why does not bazaar protect against this?