From owner-freebsd-arch@FreeBSD.ORG Mon Mar 6 08:46:09 2006 Return-Path: X-Original-To: freebsd-arch@freebsd.org Delivered-To: freebsd-arch@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7766D16A420 for ; Mon, 6 Mar 2006 08:46:09 +0000 (GMT) (envelope-from nik@ngo.org.uk) Received: from jc.ngo.org.uk (jc.ngo.org.uk [69.55.225.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 333DB43D49 for ; Mon, 6 Mar 2006 08:46:09 +0000 (GMT) (envelope-from nik@ngo.org.uk) Received: from [192.168.0.20] (i-83-67-27-141.freedom2surf.net [83.67.27.141]) by jc.ngo.org.uk (8.13.4/8.13.5) with ESMTP id k268jbYp041798; Mon, 6 Mar 2006 00:46:07 -0800 (PST) (envelope-from nik@ngo.org.uk) Message-ID: <440BF6AF.7090604@ngo.org.uk> Date: Mon, 06 Mar 2006 08:45:35 +0000 From: Nik Clayton User-Agent: Thunderbird 1.5 (X11/20060117) MIME-Version: 1.0 To: Ollivier Robert References: <20060302155625.37140.qmail@web32714.mail.mud.yahoo.com> <20060302160958.GA2035@flame.pc> <20060303082016.GA17730@stud.fit.vutbr.cz> <20060304163311.GA912@tara.freenix.org> In-Reply-To: <20060304163311.GA912@tara.freenix.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: (0) X-Scanned-By: MIMEDefang 2.54 on 69.55.225.33 Cc: freebsd-arch@freebsd.org Subject: Re: Subversion? (Re: HEADS UP: Importing csup into base) 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, 06 Mar 2006 08:46:09 -0000 Ollivier Robert wrote: > Now, I don't think subversion is the answer. It has some better things > than CVS (which is not difficult in itself) but still lacks a fundamental > feature: when you merge from a branch, it has no memory that you did so and > when. It is bad. Subversion is really two products. One is a network-aware versioned filesystem, the other is a set of tools for working on top of that filesystem. It's true that the standard tools shipped with Subversion don't support that feature, but there's no reason why Subversion-the-filesystem couldn't. Since the filesystem supports arbitrary named properties, you could use a different tool, alongside the tools that ship as part of Subversion-the-product, and store this information in the repository as properties. In fact, this is exactly what contrib/svnmerge in the Subversion distribution does. N