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 13:17:39 +0200 Message-ID: <837hricn8s.fsf@gnu.org> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <83d41acr32.fsf@gnu.org> Reply-To: Eli Zaretskii 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 1263640692 14899 80.91.229.12 (16 Jan 2010 11:18:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 11:18:12 +0000 (UTC) Cc: keramida@ceid.upatras.gr, acm@muc.de, emacs-devel@gnu.org To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 12:18:04 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 1NW6fL-0005Fm-KY for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 12:18:03 +0100 Original-Received: from localhost ([127.0.0.1]:46013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW6fM-0006Yy-4l for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 06:18:04 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW6fF-0006Wq-Cp for emacs-devel@gnu.org; Sat, 16 Jan 2010 06:17:57 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW6fA-0006Sk-RK for emacs-devel@gnu.org; Sat, 16 Jan 2010 06:17:56 -0500 Original-Received: from [199.232.76.173] (port=56666 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW6fA-0006SZ-JI for emacs-devel@gnu.org; Sat, 16 Jan 2010 06:17:52 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:8893) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NW6fA-00089z-DV for emacs-devel@gnu.org; Sat, 16 Jan 2010 06:17:52 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW6f9-0002s6-BY for emacs-devel@gnu.org; Sat, 16 Jan 2010 06:17:51 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWC00M007CCPY00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 16 Jan 2010 13:17:04 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.124.130.198]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWC00MDK7C89A20@a-mtaout22.012.net.il>; Sat, 16 Jan 2010 13:16:57 +0200 (IST) In-reply-to: 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:120109 Archived-At: > From: Lennart Borgman > Date: Sat, 16 Jan 2010 11:02:50 +0100 > Cc: keramida@ceid.upatras.gr, acm@muc.de, emacs-devel@gnu.org >=20 > > =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 a= nd > > whatever happened in the mainline since the last time you merged = =66rom > > it. >=20 >=20 > Thanks Eli, but what worries me is that it looks like one could tak= e 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. I think "bad state" is an exaggeration. E.g., Giorgos just posted on= e simple way out of this predicament; there are many others. And yes, if you work in a branch, you need to grow genes to do a "bzr commit" immediately after "bzr merge". Note that a similar trouble could happen to you if you "cvs up" with uncommitted changes in the sandbox, and some of the updates conflict with your local changes. > Is that really true??? If so why does not bazaar protect against th= is? It's really easy to get out of this "bad state". No more complicated than with CVS.