From owner-freebsd-arch@FreeBSD.ORG Mon Aug 29 21:06:34 2011 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62F951065674; Mon, 29 Aug 2011 21:06:34 +0000 (UTC) (envelope-from perryh@pluto.rain.com) Received: from agora.rdrop.com (agora.rdrop.com [IPv6:2607:f678:1010::34]) by mx1.freebsd.org (Postfix) with ESMTP id 3C51C8FC18; Mon, 29 Aug 2011 21:06:34 +0000 (UTC) Received: from agora.rdrop.com (66@localhost [127.0.0.1]) by agora.rdrop.com (8.13.1/8.12.7) with ESMTP id p7TL6WOY046968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 29 Aug 2011 14:06:33 -0700 (PDT) (envelope-from perryh@pluto.rain.com) Received: (from uucp@localhost) by agora.rdrop.com (8.13.1/8.12.9/Submit) with UUCP id p7TL6WkO046967; Mon, 29 Aug 2011 14:06:32 -0700 (PDT) Received: from fbsd81 ([192.168.200.81]) by pluto.rain.com (4.1/SMI-4.1-pluto-M2060407) id AA16901; Mon, 29 Aug 11 13:39:15 PDT Date: Mon, 29 Aug 2011 20:39:11 -0700 From: perryh@pluto.rain.com To: philip@freebsd.org Message-Id: <4e5c5b5f.moT7dLemOuteQJ5T%perryh@pluto.rain.com> References: <35765857-1314243257-cardhu_decombobulator_blackberry.rim.net-329610575-@b2.c15.bise7.blackberry> <4e5ba9c3.bzHIw1KEy8R2QcK7%perryh@pluto.rain.com> <3420B331-C697-468A-80BA-B31C33804710@freebsd.org> In-Reply-To: <3420B331-C697-468A-80BA-B31C33804710@freebsd.org> User-Agent: nail 11.25 7/29/05 Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: vadim_nuclight@mail.ru, freebsd-arch@freebsd.org Subject: Re: Official git export X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 21:06:34 -0000 Philip Paeps wrote: > On 29 Aug 2011, at 17:01, perryh@pluto.rain.com wrote: > > Vadim Goncharov wrote: > >> May be FreeBSD should really write it's own VCS, just as Git was > >> modelled after proprietary BitKeeper?.. > > > > Good luck getting agreement on what to model it on :) > > > > Personally I would suggest ClearCase as a model, but that's > > largely because I'm familiar with it. > > Wait... you're familiar with ClearCase and you want something > that's modelled like it? Most people familiar with ClearCase > consider it to be a dire warning of what a VCS can become, not > an example. :) > > I think any system where the server has to keep track of every > client's files is pretty much obsolete in 2011. It scales > unbelievably poorly. The VOB server does keep track of every view's[1] checkouts, but I consider that a very low-level implementation detail -- there's no reason in principle why that record couldn't be kept in the view instead of in the VOB. (In a distributed system, which is what FreeBSD needs, checkout records _can't_ be maintained centrally.) What I'm advocating is the usage experience. Things like: * Anyone can create a branch, and no one else will be aware of it unless they go looking for it, but all branches are peers. * Checkout, editing, and checkin of directories follows the same workflow as files. * Elements (files, directories) can be moved from one directory to another without losing history. The move is initially visible only on the branch where it is performed, becoming visible on other branches via merging, just as with file edits. * Graphical visualization of any element's branch and version tree, including all merges. * Automatic identification of the common ancestor ("base contributor") version when performing a merge. * The best multi-way merge tool I have seen -- it has issues, but overall I rate it a B+. (I would rate most no higher than a C.) The same merge tool is used for directories as for files, with directory entries being represented textually. ---------- [1] Not every client's -- one view server typically supports multiple clients, and nothing keeps track of _them_.