From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Rewriting bzrmerge.el Date: Mon, 24 Nov 2014 17:11:02 +0200 Message-ID: <83zjbgprax.fsf@gnu.org> References: <20141027000718.F09B5382A66@snark.thyrsus.com> <87bno8y0rt.fsf_-_@engster.org> <871tp4xx4i.fsf@engster.org> <87tx20whtq.fsf@engster.org> <87lhn4rx0v.fsf@engster.org> <838uj3tztm.fsf@gnu.org> <87egsvrz6e.fsf@engster.org> <83mw7jrxt9.fsf@gnu.org> <87a93jrw83.fsf@engster.org> <83ioi7rn9o.fsf@gnu.org> <87oarysr3u.fsf@uwakimon.sk.tsukuba.ac.jp> <87k32mrlyn.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416841932 13753 80.91.229.3 (24 Nov 2014 15:12:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 24 Nov 2014 15:12:12 +0000 (UTC) Cc: larsi@gnus.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 24 16:12:03 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XsvJ3-0007yh-Jb for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2014 16:12:01 +0100 Original-Received: from localhost ([::1]:53121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsvJ3-0000xC-2H for ged-emacs-devel@m.gmane.org; Mon, 24 Nov 2014 10:12:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsvI4-0000DV-4I for emacs-devel@gnu.org; Mon, 24 Nov 2014 10:11:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsvHx-00054i-Il for emacs-devel@gnu.org; Mon, 24 Nov 2014 10:11:00 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:51220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsvHx-00054N-6o for emacs-devel@gnu.org; Mon, 24 Nov 2014 10:10:53 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NFJ00500TZ1A800@mtaout26.012.net.il> for emacs-devel@gnu.org; Mon, 24 Nov 2014 17:09:28 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFJ00LFBU3SLO80@mtaout26.012.net.il>; Mon, 24 Nov 2014 17:09:28 +0200 (IST) In-reply-to: <87k32mrlyn.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178178 Archived-At: > From: "Stephen J. Turnbull" > Date: Mon, 24 Nov 2014 00:11:12 +0900 > Cc: emacs-devel@gnu.org > > yes, I know about bzr shared repos, but > my bzr setup with about 5 Emacs branches including trunk, emacs-24, > and emacs-23 uses about 3X as much space as my git repo with all Emacs > git branches in it That's not really a fair comparison, as it includes the work trees, of which the Git repo has only one. It would be more fair to compare the .bzr subdirectory of the Bazaar repository with the .git subdirectory of the Git repository, in which case Git wins with a 1:2 ratio (which might deteriorate to some extent in the future, since the initial repository was very aggressively packed). > Simply doing "git clone source-repo target-repo" uses very little > extra space (or time) at clone time because the objects are > hard-linked across directories by default. That is true (even on Windows), but then one would need to pull twice, once from upstream, the other time from the first clone to the second, right? Doesn't sound a net win to me. > I don't see any good reason for describing any other strategies than > "if you're worried about bootstrap times, just use a second clone from > your local trunk repo". That's what I will probably write, yes. > > The answer currently seems to be "use git-new-workdir" > > This should work OK 99.44% of the time in Emacs workflows, but if the > new user gets frisky with rebasing or commit --amend etc, they *can* > shoot themselves in the foot. If they do, they almost certainly will > break a private part of the repo that cannot be recovered from public > sources. I don't think that's worth it, IMHO FWIW YMMV. I will probably mention git-new-workdir, but not more than that. Interested readers can read the documentation and set that up. Thanks.