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: Basic Bazaar guide for Emacs hackers. Date: Tue, 01 Dec 2009 16:53:41 -0500 Message-ID: References: <87skbzblp5.fsf@telefonica.net> <87y6log42q.fsf@red-bean.com> <87y6lo8zgi.fsf@telefonica.net> <87638sy5ab.fsf@uwakimon.sk.tsukuba.ac.jp> <87tywc8u7t.fsf@telefonica.net> <87k4x76wpp.fsf@telefonica.net> <8e0e71cb0911302252v6a7c9f80j532308eb0a842816@mail.gmail.com> <4B14D4FC.8070509@gnu.org> <8e0e71cb0912010726k56f90cbbm8d96b5e0dd3a6b6f@mail.gmail.com> <837ht6ms94.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 1259704537 27753 80.91.229.12 (1 Dec 2009 21:55:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Dec 2009 21:55:37 +0000 (UTC) Cc: Karl Fogel , ofv@wanadoo.es, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 01 22:55:30 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 1NFagw-0007UO-1G for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 22:55:26 +0100 Original-Received: from localhost ([127.0.0.1]:53429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFagv-0001wv-Pu for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2009 16:55:25 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFagq-0001wm-3f for emacs-devel@gnu.org; Tue, 01 Dec 2009 16:55:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFagl-0001w3-In for emacs-devel@gnu.org; Tue, 01 Dec 2009 16:55:19 -0500 Original-Received: from [199.232.76.173] (port=35959 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFagl-0001w0-Ct for emacs-devel@gnu.org; Tue, 01 Dec 2009 16:55:15 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:57815) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFagj-0005J7-Bo; Tue, 01 Dec 2009 16:55:13 -0500 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id nB1Lrfue025084; Tue, 1 Dec 2009 16:53:41 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 844313A14D; Tue, 1 Dec 2009 16:53:41 -0500 (EST) In-Reply-To: <837ht6ms94.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 01 Dec 2009 21:03:19 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-NAI-Spam-Level: X-NAI-Spam-Score: 0.5 X-NAI-Spam-Rules: 2 Rules triggered DATE_FUTURE=0.5, RV3418=0 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:118072 Archived-At: > is a closer equivalent of the CVS checkout, because it only checks out > the working tree without creating a full local copy of history. The > history is only needed if one wants to commit locally. People who > don't plan on using local commits don't need to pay the extra price of > larger disk storage and probably also some additional time it takes to > do a heavyweight checkout. > OTOH, if we think that a heavyweight checkout is the recommended way, > then we should at least mention its main benefit -- the local commit. The local commit (at least via --local) is not for the faint of heart (at least it got me confused several times, because when you later dp an "update", it seems to label the conflicts in ways that make me believe that my changes are actually the ones fetched from upstream and vice-versa). So, no, it's not the main feature. The main feature is that "bzr diff", "bzr log", and friends will work without requiring access to the remote repository. > Currently, the page only hints on that, but stops short of showing the > commands to use this potential: > You have in your disk a copy of the VC history of the trunk branch > since the last bzr update. Hence, Bazaar does not need to contact a > server upstream for displaying logs, reverting edited files, > annotating, etc. This is useful for working off-line. > Bazaar makes possible to commit changes off-line to your local history > and send them upstream in one batch. > Personally, I would do both: tell about --lightweight as the > equivalent of CVS, and also tell about the local commits available > with the heavyweight checkouts. But that's me. I could agree to adding some comment about the use of "unbind" to turn a heavyweight checkout into a plain branch. But maybe it's even better to not present "heavyweight checkout" and instead only present the "standalone branch" instead: checkout via: bzr branch update via: bzr pull commit via: bzr commit; bzr push Stefan