From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Sun, 22 Nov 2009 16:06:53 -0500 Message-ID: References: <87639fr3w7.fsf@red-bean.com> <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> <83einsozea.fsf@gnu.org> <873a48djpi.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1258924042 27530 80.91.229.12 (22 Nov 2009 21:07:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Nov 2009 21:07:22 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , Eli Zaretskii , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 22 22:07:14 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 1NCJeJ-000109-Qs for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2009 22:07:12 +0100 Original-Received: from localhost ([127.0.0.1]:57349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCJeJ-0004lP-5C for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2009 16:07:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCJeE-0004lI-9A for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:07:06 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCJe8-0004k0-Tw for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:07:05 -0500 Original-Received: from [199.232.76.173] (port=45006 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCJe8-0004jx-Qt for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:07:00 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:25615 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCJe7-0006bW-7O; Sun, 22 Nov 2009 16:06:59 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvYEAP42CUvO+IIa/2dsb2JhbACBTdE/hDwEigI X-IronPort-AV: E=Sophos;i="4.47,267,1257138000"; d="scan'208";a="49815574" Original-Received: from 206-248-130-26.dsl.teksavvy.com (HELO ceviche.home) ([206.248.130.26]) by ironport2-out.pppoe.ca with ESMTP; 22 Nov 2009 16:06:54 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id E1AF3B40C9; Sun, 22 Nov 2009 16:06:53 -0500 (EST) In-Reply-To: <873a48djpi.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Sat, 21 Nov 2009 23:40:57 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:117509 Archived-At: >> > A non lightweight checkout supports committing changes without sending >> > them to the parent branch, using a command line option. >> When and why would this be useful? > It's useful for splitting your history into bite-size, coherent pieces > that you aren't ready to push to the mainline. For example, you might > add an argument to foofunc in foo.el, and fix all the calls in core > Lisp. Now you commit. Next you go through all the packages, and fix > them up too, with a separate commit to each one, because you're not as > sure you understand the code in each one. This allows you to add a > comment explaining your uncertainty to the commit log, or have the > package's principal maintainer veto that commit only while everything > else goes through. > Then you cd to your local copy of the mainline branch, merge that > branch into it, and push to the public repo. By default bzr log will > show only that the whole branch got merged, but someone who is curious > can see the detailed history. Note that in my experience bzr's support for "local commit without sending upstream" in bound branches (aka heavyweight checkouts) is poor, and you may get confusing results. So I think that if you want to do that you'll probably be better off using a non-bound branch. You can tempoarily do that: bzr unbind ..do all the work locally.. bzr commit ..some more work... bzr commit ..some more work... bzr commit bzr push bzr bind Cases where it's useful as well is when you can't commit upstream because you don't have an internet connection. >> Would a lightweight checkout from the master repository be a good idea >> for people who do not intend to send patches, just build the current >> development version? > Yes. I take back what I wrote in my previous response; this is indeed > an *excellent* third reason for lightweight checkouts, probably much > more important than "casual contribution". Note that a lightweight checkout will make pretty much all bzr commands slower because they'll always have to contact the repository. Stefan