From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Riedy Subject: Re: Git repository Date: Thu, 31 Jan 2008 10:52:29 -0800 Message-ID: <87fxwdakuq.fsf@sparse.yi.org> References: <87y7a62eng.fsf@gollum.intra.norang.ca> <4A1A58D4-4BE6-468C-B7EC-1324D354DD0D@science.uva.nl> <20080131160113.GC16742@odin.demosthenes.org> <20080131163300.GC21213@atlantic.linksys.moosehall> <87d4rhlx0g.fsf@bzg.ath.cx> <20080131174753.GD16742@odin.demosthenes.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JKesV-0004C7-7V for emacs-orgmode@gnu.org; Thu, 31 Jan 2008 14:15:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JKesQ-0004Az-Iz for emacs-orgmode@gnu.org; Thu, 31 Jan 2008 14:15:14 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JKesQ-0004Aw-GB for emacs-orgmode@gnu.org; Thu, 31 Jan 2008 14:15:10 -0500 Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JKesQ-0003vJ-BX for emacs-orgmode@gnu.org; Thu, 31 Jan 2008 14:15:10 -0500 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1JKesI-0003AD-OH for emacs-orgmode@gnu.org; Thu, 31 Jan 2008 19:15:02 +0000 Received: from 69-12-153-204.dsl.dynamic.sonic.net ([69.12.153.204]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 31 Jan 2008 19:15:02 +0000 Received: from jason by 69-12-153-204.dsl.dynamic.sonic.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 31 Jan 2008 19:15:02 +0000 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org And Russell Adams writes: > When I was selecting a VC, I narrowed it down to Bazaar or Git. Being > a prior Arch user, Bazaar fixed most of my complaints while using the > same architecture. The Arch architecture doesn't fit everyone. In particular, a colleague and I used tla to shoot changes back and forth rapidly. We ended up with a history with at least 40% merge detritus. git doesn't bother recording merge information when the merge is trivial (a fast-forward of one history to match another). That fit our working model and my mental model better. Generally, git tracks contents rather than changes. That's how my head works as well, so most git functions do what I expect and want. Any technical differences are insignificant in comparison. Git and Mercurial archives can exist on the far side of a "dumb" transport like http. They're not ideal necessarily, but they function well enough. Jason