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: Locks on the Bzr repository Date: Fri, 20 Aug 2010 19:15:38 +0900 Message-ID: <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282304608 26873 80.91.229.12 (20 Aug 2010 11:43:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 20 Aug 2010 11:43:28 +0000 (UTC) Cc: jan.h.d@swipnet.se, Andreas Schwab , monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 20 13:43:27 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.69) (envelope-from ) id 1OmPzJ-0006YP-5H for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2010 13:43:26 +0200 Original-Received: from localhost ([127.0.0.1]:48402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmPz6-0005pO-Pu for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2010 07:42:08 -0400 Original-Received: from [140.186.70.92] (port=34215 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmPib-0000Bf-FE for emacs-devel@gnu.org; Fri, 20 Aug 2010 07:25:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmOvP-0006Lf-BE for emacs-devel@gnu.org; Fri, 20 Aug 2010 06:34:16 -0400 Original-Received: from [130.158.254.171] (port=50099 helo=dmail02.cc.tsukuba.ac.jp) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmOvN-0006KD-RV; Fri, 20 Aug 2010 06:34:14 -0400 Original-Received: from imss12.cc.tsukuba.ac.jp (unknown [130.158.254.130]) by dmail02.cc.tsukuba.ac.jp (Postfix) with ESMTP id 172F7F51DF; Fri, 20 Aug 2010 19:18:47 +0900 (JST) Original-Received: from imss12.cc.tsukuba.ac.jp (imss12.cc.tsukuba.ac.jp [127.0.0.1]) by postfix.imss70 (Postfix) with ESMTP id BCD12F4003; Fri, 20 Aug 2010 19:18:32 +0900 (JST) Original-Received: from mgmt2.sk.tsukuba.ac.jp (unknown [130.158.97.224]) by imss12.cc.tsukuba.ac.jp (Postfix) with ESMTP id ADE43F4002; Fri, 20 Aug 2010 19:18:32 +0900 (JST) Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id A97419702E1; Fri, 20 Aug 2010 19:18:32 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 96D481A2C38; Fri, 20 Aug 2010 19:15:38 +0900 (JST) In-Reply-To: <837hjlr78p.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta29) "garbanzo" ed3b274cc037 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.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:128912 Archived-At: Eli Zaretskii writes: > Plus, pushing many unrelated commits has a drawback as not showing > in "bzr log" unless you also use the --include-merges (or -n0) > switch, which makes "bzr log" significantly slower. No. Push simply synchronizes the histories, and IIRC to push in bzr you must be a superset of the remote repo's history. So what matters to the bzr log view is how you manage your local repo, not whether you push or commit via a bound branch. You may need to rebase if somebody sneaks in a commit before you start your push, but I would imagine you normally need less locking and a lot less time if the push succeeds. It's true that if you only ever use bound branches, all your commits must end up on the mainline, and that may be the best strategy for some people. But other people like to commit more frequently and/or offline.