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 12:10:53 +0200 Message-ID: <838wbycqc2.fsf@gnu.org> References: <20100115222724.GB1931@muc.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1263636632 5076 80.91.229.12 (16 Jan 2010 10:10:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 10:10:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 11:10:24 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 1NW5bs-0000qH-IM for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 11:10:24 +0100 Original-Received: from localhost ([127.0.0.1]:52173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5bt-0001hX-7m for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 05:10:25 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW5bm-0001hR-OL for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:10:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW5bh-0001hE-IF for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:10:18 -0500 Original-Received: from [199.232.76.173] (port=37419 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW5bh-0001hB-8i for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:10:13 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:57119) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW5bg-0003K4-P3 for emacs-devel@gnu.org; Sat, 16 Jan 2010 05:10:13 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWC00K0047D9T00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 16 Jan 2010 12:10:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.60.183]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWC00JM648YVQ10@a-mtaout22.012.net.il>; Sat, 16 Jan 2010 12:10:11 +0200 (IST) In-reply-to: <20100115222724.GB1931@muc.de> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:120106 Archived-At: > 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.) 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. > 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.