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 11:59:19 +0200 Message-ID: <87d41av094.fsf@kobe.laptop> 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=us-ascii X-Trace: ger.gmane.org 1263635982 3293 80.91.229.12 (16 Jan 2010 09:59:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 09:59:42 +0000 (UTC) Cc: acm@muc.de, Lennart Borgman , 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:59:35 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 1NW5RP-00060j-5w for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 10:59:35 +0100 Original-Received: from localhost ([127.0.0.1]:52376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5RP-0005kt-Rf for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 04:59:35 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW5RJ-0005jT-LF for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:59:29 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW5RF-0005gd-8r for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:59:29 -0500 Original-Received: from [199.232.76.173] (port=37665 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5RF-0005gR-2G for emacs-devel@gnu.org; Sat, 16 Jan 2010 04:59:25 -0500 Original-Received: from poseidon.ceid.upatras.gr ([150.140.141.169]:42594) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW5RC-000840-U3; Sat, 16 Jan 2010 04:59:23 -0500 Original-Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 04363EB47F8; Sat, 16 Jan 2010 11:59:22 +0200 (EET) Original-Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id EA51A160F6F; Sat, 16 Jan 2010 11:59:21 +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 vEL7ab4uDB3F; Sat, 16 Jan 2010 11:59:21 +0200 (EET) Original-Received: from kobe.laptop (ppp-94-64-252-169.home.otenet.gr [94.64.252.169]) by mail.ceid.upatras.gr (Postfix) with ESMTP id B1117160F6D; Sat, 16 Jan 2010 11:59:21 +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 o0G9xKML063658 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 16 Jan 2010 11:59:20 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id o0G9xKUD063655; Sat, 16 Jan 2010 11:59:20 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) In-Reply-To: <83d41acr32.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Jan 2010 11:54:41 +0200") 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:120103 Archived-At: On Sat, 16 Jan 2010 11:54:41 +0200, Eli Zaretskii wrote: >> From: Lennart Borgman >> 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: > > bzr merge > bzr commit > > The first one merges the text of the files, but does not combine their > histories. The 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. Exactly. This is not a 'problem' of bazaar, FWIW. I's just the way things work in all DVCS when you have committed local changes in a non-bound branch. Thank you Eli for writing up a very detailed explanation :-)