From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Sun, 22 Nov 2009 05:08:55 +0900 Message-ID: <87tywnd4iw.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87vdhfpil2.fsf@red-bean.com> <87einvxy9c.fsf@red-bean.com> <20091118230952.GB908@muc.de> <87my2jw05z.fsf@red-bean.com> <83skc9pbf7.fsf@gnu.org> <87iqd5vw5n.fsf@red-bean.com> <877htl53tc.fsf@telefonica.net> <871vjs6ci7.fsf@telefonica.net> <87d43c4f1e.fsf@telefonica.net> <87ocmwtlbs.fsf@red-bean.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1258841508 31766 80.91.229.12 (21 Nov 2009 22:11:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 21 Nov 2009 22:11:48 +0000 (UTC) Cc: emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 21 23:11:40 2009 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 1NByA4-0003SB-Ko for ged-emacs-devel@m.gmane.org; Sat, 21 Nov 2009 23:10:32 +0100 Original-Received: from localhost ([127.0.0.1]:55217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NBwAT-00077K-GR for ged-emacs-devel@m.gmane.org; Sat, 21 Nov 2009 15:02:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NBwAJ-00073L-6R for emacs-devel@gnu.org; Sat, 21 Nov 2009 15:02:39 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NBwAE-00071G-8A for emacs-devel@gnu.org; Sat, 21 Nov 2009 15:02:38 -0500 Original-Received: from [199.232.76.173] (port=36608 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NBwAD-000717-Ux for emacs-devel@gnu.org; Sat, 21 Nov 2009 15:02:34 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]:57397) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NBwAD-000215-2J for emacs-devel@gnu.org; Sat, 21 Nov 2009 15:02:33 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mtps01.sk.tsukuba.ac.jp (Postfix) with ESMTP id 3A5731535AF; Sun, 22 Nov 2009 05:02:31 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id A96A11A28C6; Sun, 22 Nov 2009 05:08:55 +0900 (JST) In-Reply-To: <87ocmwtlbs.fsf@red-bean.com> X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" d20e0a45a4b2 XEmacs Lucid (x86_64-unknown-linux) 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:117465 Archived-At: Karl Fogel writes: > Everyone: > > It's a wiki. Please edit it :-). OK, I've done so :-). Please review my work, though; I'm far more expert on git and VCS theory than I am on bzr pragmatics. Specifically, one small change was I glossed the difference between the "dev" branch (one branch for sequences of small independent changes), vs. the SOME-TASKNAME branch (of which there will be many, each containing a set of related commits). For example, typically you would delete a feature branch, but hang on to and reuse the "'dev" branch. The more important one is that AIUI, pushing directly from SOME-TASKNAME is a bad idea. Typically, you want to merge that branch into trunk (the mirror branch), then commit (which automatically pushes to upstream in the recommended setup as a bound branch). The reason is that you want something like this, which is how Bazaar will present the merge and commit workflow: $ bzr log 3 Merge the fiddling-while-bits-rot branch aka SOME-TASKNAME 2 Merge concurrent development 1 Parent of SOME-TASKNAME $ bzr log -n 0 3 Merge the fiddling-while-bits-rot branch aka SOME-TASKNAME 3.3 Munge a bunch of fiddly little bits, all alike 3.2 Merge from trunk 3.1 Munge a fiddly little bunch of bits, all alike 2 Merge concurrent development 2.1 One big ol commit 1 Parent of SOME-TASKNAME [several hundred thousand fiddly commits elided] Not this, which is how Bazaar will present the "just push" workflow: $ bzr log 5 Merge the fiddling-while-bits-rot branch aka SOME-TASKNAME 4 Munge a bunch of fiddly little bits, all alike 3 Merge from trunk 2 Munge a fiddly little bunch of bits, all alike 1 Parent of SOME-TASKNAME $ bzr log -n 0 5 Merge the fiddling-while-bits-rot branch aka SOME-TASKNAME 4 Munge a bunch of fiddly little bits, all alike 3 Merge from trunk 3.1 Merge concurrent development 3.1.1 One big ol commit 2 Munge a fiddly little bunch of bits, all alike 1 Parent of SOME-TASKNAME [several hundred thousand fiddly commits elided] Note how the latter inflates the importance of individual commits from SOME-TASKNAME, while confusing the timing with which various commits landed on the trunk. (I'm not sure I got the above exactly right, but such effects are definitely part of the way bzr log looks at the branch's history.)