From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Sat, 21 Aug 2010 20:50:35 +0100 Message-ID: References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> <83tymppj62.fsf@gnu.org> <871v9t8klf.fsf@uwakimon.sk.tsukuba.ac.jp> <83lj81pazq.fsf@gnu.org> <83aaogpcbu.fsf@gnu.org> <87vd737pxd.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: dough.gmane.org 1282420263 25310 80.91.229.12 (21 Aug 2010 19:51:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 Aug 2010 19:51:03 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 21 21:51:01 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 1Omu5e-0002FS-8R for ged-emacs-devel@m.gmane.org; Sat, 21 Aug 2010 21:50:59 +0200 Original-Received: from localhost ([127.0.0.1]:40226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Omu5b-0004SJ-Kg for ged-emacs-devel@m.gmane.org; Sat, 21 Aug 2010 15:50:51 -0400 Original-Received: from [140.186.70.92] (port=53171 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Omu5W-0004SE-GE for emacs-devel@gnu.org; Sat, 21 Aug 2010 15:50:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Omu5U-0005Mi-T2 for emacs-devel@gnu.org; Sat, 21 Aug 2010 15:50:45 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:50793) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Omu5U-0005Mb-HG for emacs-devel@gnu.org; Sat, 21 Aug 2010 15:50:44 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Omu5S-0002Au-DI for emacs-devel@gnu.org; Sat, 21 Aug 2010 21:50:42 +0200 Original-Received: from cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com ([86.9.122.85]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 Aug 2010 21:50:42 +0200 Original-Received: from sdl.web by cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 21 Aug 2010 21:50:42 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 36 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: cpc1-cmbg13-0-0-cust596.5-4.cable.virginmedia.com Face: iVBORw0KGgoAAAANSUhEUgAAACgAAAAoAgMAAADxkFD+AAAADFBMVEUvT09qWs3/pQD///+J kUVcAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9cBBwMLOd3veKQA AACuSURBVBjTldE9CgIxEAXgB+lEyFUC2wo5ikdZ8DSypxhMY7H9VuIVwlqkGRgnm59VsHGafIQ3 CZlAtmKIRaHETgYa12lqvEsPYKf8wXHsPGfqPaUM0g9aJPKFXkmNQmSDqwzz4Fpgpz+6WAPY2z5o uPJJpu0uypcl4nyCibMLQ8lCiVjayLoQvw5LsVKQuHPRR958HZbOcVsKeepcLxpByjycGvnKmY+c MBvrtyjfe0vmuLvdq/kAAAAASUVORK5CYII= User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (Mac OS X 10.6.4) Cancel-Lock: sha1:KUHMUuMVPW5bvJ/LKsSA5n7RG9U= X-detected-operating-system: by eggs.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:128991 Archived-At: On 2010-08-21 19:59 +0100, Stephen J. Turnbull wrote: > D'oh. You just don't ever want to do development in your mirror branch > (unless it's bound). The reason this is a problem in bzr (and to some > extent hg) is that branches are heavyweight; you don't want scads of > them being made automatically for internal operations. So the user has > to make mirror branches explicitly when needed. git makes branching > extremely lightweight, and therefore need not hesitate to use mirror > ("tracking") branches which are read-only to the user, and hardly > visible. Branching in git is as fast as: echo 7adb0b64823cbdcfbbcac9a9e32c6b435f57d889 > .git/refs/heads/mybranch basically writing a 40-char string to a file. Because it is so cheap it completely change many people's workflow. Even for my occasional hacking of emacs, I have: * Ferrari emacs-server emacs-trunk git-send-email ido ido-old leo mac-port master processes It is extremely difficult to lose data in git. So rebase is as safe as commit. Knowing that I can easily reorganise my private history (it takes ~ 5 seconds) I also use commit as a way of backup. Using git really gives you the feeling of using the right tool that is as intelligent as human being as far as content tracking is concerned. Leo