From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Mon, 23 Nov 2009 00:41:53 -0600 Message-ID: <873a4591zi.fsf@red-bean.com> 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> <87tywnd4iw.fsf@uwakimon.sk.tsukuba.ac.jp> <87pr7a9kob.fsf@red-bean.com> <87vdh1sryt.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1258958540 6498 80.91.229.12 (23 Nov 2009 06:42:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Nov 2009 06:42:20 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 07:42:13 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 1NCScl-000600-4o for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2009 07:42:11 +0100 Original-Received: from localhost ([127.0.0.1]:60203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCSck-0002kT-Uc for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2009 01:42:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCScc-0002jy-Jh for emacs-devel@gnu.org; Mon, 23 Nov 2009 01:42:02 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCScX-0002jQ-Ko for emacs-devel@gnu.org; Mon, 23 Nov 2009 01:42:01 -0500 Original-Received: from [199.232.76.173] (port=54667 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCScX-0002jN-DJ for emacs-devel@gnu.org; Mon, 23 Nov 2009 01:41:57 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]:58300) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NCScW-00009I-Gw for emacs-devel@gnu.org; Mon, 23 Nov 2009 01:41:56 -0500 Original-Received: from localhost ([127.0.0.1]:33059 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.69) (envelope-from ) id 1NCScU-0000Vp-W6; Mon, 23 Nov 2009 00:41:55 -0600 In-Reply-To: <87vdh1sryt.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Mon, 23 Nov 2009 14:58:02 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) 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:117567 Archived-At: "Stephen J. Turnbull" writes: > Hey, by the time I finished that entry it was 4 am.... I think I done > purty good. You did, you did! :-) > > I don't understand the second part. How will commits on the mainline be > > hidden? (That is, from whom will they be hidden, and in what > > situations?) > > They will be hidden from "bzr log -n1" on the master repository, when > they are brought in to SOME-TASKNAME via merges from the master > (upstream) or trunk (local mirror). The reason is that when you merge > into SOME-TASKNAME from one of those, the commit from SOME-TASKNAME is > the *left parent* of the merge commit. When you push that merge > commit to master, it will become the tip *as is*, and thus all work > committed to the master since SOME-TASKNAME branched will be on > rightward branches, and will be summarized as merges into SOME-TASKNAME. Whooo... okay, I see, right. So, how shall we summarize that in a parenthetical aside? (Rhetorical question. I agree with your suggestion below that we're better off just recommending against that workflow.) > > It might be better just to recommend the merge-and-commit workflow for > > *everything*, always, and let those who want to become Bzr Jedi Masters > > learn to do the "just push" on their own, when they are experienced > > enough to understand the consequences. Thoughts? > > I agree about the recommendation, but think description of the effects > should be moved to a separate page (or an explanatory section if > there's a possibility that this page might move to bazaar-vcs). It's > too easy to discover for yourself, so I would write something like > > It might occur to you to save some effort by doing "bzr push" from > the SOME-TASKNAME branch. *Do not do this*: it `results in a > different history`__ in the upstream master. > > __BzrLogTreatsLeftmostParentsDifferentlyFromRightwardParents > > (markup is reStructuredText). The linked page would contain the full > explanation. I completely agree. We might even find a place in the existing generic Bazaar documentation we can point to, for some of these effects. It's late in Chicago now and I won't have a chance to make this edit before I sleep. If you get a chance, please go ahead and do it; otherwise I'll try to update the doc later. -Karl