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: Locks on the Bzr repository Date: Tue, 24 Aug 2010 19:48:54 +0300 Message-ID: <83bp8sneh5.fsf@gnu.org> 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> <83pqxboi38.fsf@gnu.org> <19568.59349.718000.978281@gargle.gargle.HOWL> <19570.10774.921000.853692@gargle.gargle.HOWL> <878w3x7h8u.fsf@uwakimon.sk.tsukuba.ac.jp> <19570.27753.731000.392172@gargle.gargle.HOWL> <87zkwc5xnr.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282668421 31403 80.91.229.12 (24 Aug 2010 16:47:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 24 Aug 2010 16:47:01 +0000 (UTC) Cc: u.s.reddy@cs.bham.ac.uk, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 24 18:47:00 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 1OnweJ-00085P-Aq for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 18:46:59 +0200 Original-Received: from localhost ([127.0.0.1]:53202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnweI-0006EK-Q7 for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 12:46:58 -0400 Original-Received: from [140.186.70.92] (port=52006 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnweC-0006EF-2w for emacs-devel@gnu.org; Tue, 24 Aug 2010 12:46:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnweA-0005GK-TB for emacs-devel@gnu.org; Tue, 24 Aug 2010 12:46:51 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:51853) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnweA-0005G2-MB for emacs-devel@gnu.org; Tue, 24 Aug 2010 12:46:50 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0L7O00N000MV0W00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Tue, 24 Aug 2010 19:46:49 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.70.215.111]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L7O00MG719Z2LB0@a-mtaout22.012.net.il>; Tue, 24 Aug 2010 19:46:49 +0300 (IDT) In-reply-to: <87zkwc5xnr.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:129158 Archived-At: > From: "Stephen J. Turnbull" > Date: Tue, 24 Aug 2010 15:31:52 +0900 > Cc: rms@gnu.org, monnier@iro.umontreal.ca, emacs-devel@gnu.org > > > Yes, the current workflow does achieve clean history, but at the > > cost of removing any gestation period for fixes that the developers > > might want. > > Not at all. I'm not sure if Eli would do a "one-commit" patch in a > separate workspace, and then merge, but he's said several times now > that he uses multiple workspaces, at least for feature branches. I do use a separate branch for one-off commits, but only if they fix, or need to be tested on, the DOS port. The DOS port does not support out-of-tree build, so I need a separate branch for it (which is mots of the time kept as a mirror of trunk, with "merge --pull").