From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Eric S. Raymond" Newsgroups: gmane.emacs.devel Subject: Re: What a modern collaboration toolkit looks like Date: Wed, 2 Jan 2008 21:49:32 -0500 Organization: Eric Conspiracy Secret Labs Message-ID: <20080103024932.GG4822@thyrsus.com> References: <20080101171120.GC3830@muc.de> <20080101.190535.32709273.wl@gnu.org> <20080101182742.GE3830@muc.de> <20080101.192802.05328072.wl@gnu.org> <20080102121745.GD17588@thyrsus.com> <87prwj1yyv.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: esr@thyrsus.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1199328578 8200 80.91.229.12 (3 Jan 2008 02:49:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 3 Jan 2008 02:49:38 +0000 (UTC) Cc: acm@muc.de, eliz@gnu.org, Richard Stallman , esr@snark.thyrsus.com, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 03 03:49:57 2008 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 1JAG9Y-00088h-Pk for ged-emacs-devel@m.gmane.org; Thu, 03 Jan 2008 03:49:53 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JAG9C-0006dP-Jj for ged-emacs-devel@m.gmane.org; Wed, 02 Jan 2008 21:49:30 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JAG99-0006dK-US for emacs-devel@gnu.org; Wed, 02 Jan 2008 21:49:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JAG98-0006ck-4H for emacs-devel@gnu.org; Wed, 02 Jan 2008 21:49:27 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JAG97-0006cd-TB for emacs-devel@gnu.org; Wed, 02 Jan 2008 21:49:25 -0500 Original-Received: from static-71-162-243-5.phlapa.fios.verizon.net ([71.162.243.5] helo=snark.thyrsus.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JAG90-0000AK-UO; Wed, 02 Jan 2008 21:49:19 -0500 Original-Received: by snark.thyrsus.com (Postfix, from userid 23) id 9AD3E830B03; Wed, 2 Jan 2008 21:49:32 -0500 (EST) Content-Disposition: inline In-Reply-To: <87prwj1yyv.fsf@uwakimon.sk.tsukuba.ac.jp> X-Eric-Conspiracy: There is no conspiracy User-Agent: Mutt/1.5.15+20070412 (2007-04-11) X-detected-kernel: by monty-python.gnu.org: 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:85963 Archived-At: Stephen J. Turnbull : > > In modern DVCSes, a push never blocks. > > I think you've typoed "push" for "commit". Specifically: You're right, I did. > BTW, to be honest, I think "commit-before-merge" is a good advertising > slogan, but it doesn't promote understanding of how dVCSes work, and > only offers the GUI/CADT/IRC/XP view of their advantages. /me becomes dizzy from a surfeit of acronyms. I coined the term mainly to contrast with the CVS/Subversion/Arch style, which requires merge before a commit can complete. I don't try to make it bear a lot of analytical weight. -- Eric S. Raymond