From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 21:27:08 +0000 Message-ID: <20100116212708.GA6676@muc.de> References: <20100115222724.GB1931@muc.de> <838wbycqc2.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 1263676861 20871 80.91.229.12 (16 Jan 2010 21:21:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 21:21:01 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 22:20:54 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 1NWG4i-0008OS-4n for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 22:20:52 +0100 Original-Received: from localhost ([127.0.0.1]:33595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWG4i-0002H2-OG for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 16:20:52 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWG4d-0002Gp-OH for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:20:47 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWG4Y-0002Gd-2l for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:20:46 -0500 Original-Received: from [199.232.76.173] (port=44841 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWG4X-0002GY-Tv for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:20:41 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:4710 helo=mail.muc.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NWG4W-000701-Gf for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:20:40 -0500 Original-Received: (qmail 61428 invoked by uid 3782); 16 Jan 2010 21:20:38 -0000 Original-Received: from acm.muc.de (pD9E53E16.dip.t-dialin.net [217.229.62.22]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Sat, 16 Jan 2010 22:20:36 +0100 Original-Received: (qmail 6811 invoked by uid 1000); 16 Jan 2010 21:27:08 -0000 Content-Disposition: inline In-Reply-To: <838wbycqc2.fsf@gnu.org> User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-detected-operating-system: by monty-python.gnu.org: FreeBSD 4.6-4.9 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:120126 Archived-At: Hi, Eli, On Sat, Jan 16, 2010 at 12:10:53PM +0200, Eli Zaretskii wrote: > > Date: Fri, 15 Jan 2010 22:27:24 +0000 > > From: Alan Mackenzie > > I've been struggling with this fine distributed version control > > system for over a week now. My trouble is that I have no mental > > picture of what the main bits are in bzr and what the relationships > > between them are. > My personal conclusion is that you don't really need to create a new > mental picture. You can largely reuse the one you had about CVS. > (There are some _new_ bits to get used to, especially when you decide > to work on a significant new feature on a local branch. But you don't > need to struggle with these new bits until you actually decide to do > such work.) In all the docs I've read, there's never been much of a separation between branches and checked-out working copies, and that's caused me a lot of confusion. > To reuse your CVS mental model, just use the "Doing Quick Fixes" > workflow as it is described on the wiki. Note that the recommended > workflow was changed since you have read it, because it no longer > proposes to use a separate local branch, but rather either do it in the > trunk or in a branch that is bound to upstream, exactly like the trunk > is. Ah. That will be why my setup doesn't match the wiki one any more. ;-) > > I don't find the bazaar documentation much help in forming such a > > mental picture. > That's true, unfortunately. Feel free to ask questions here, though. My mistake was I tried to move my changes from "quickfixes" to "trunk" using "bzr merge". 'bzr help merge' doesn't say what is merged with what where, sadly. I think what I really want is 'bzr push'. Is this correct? The documentation for 'bzr push' is not helpful. -- Alan Mackenzie (Nuremberg, Germany).