From owner-freebsd-arch@FreeBSD.ORG Mon Mar 6 13:22:16 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 954E416A420 for ; Mon, 6 Mar 2006 13:22:16 +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 4C62343D46 for ; Mon, 6 Mar 2006 13:22:16 +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 k26DMCJH035769; Mon, 6 Mar 2006 05:22:14 -0800 (PST) (envelope-from nik@ngo.org.uk) Message-ID: <440C3784.6090305@ngo.org.uk> Date: Mon, 06 Mar 2006 13:22:12 +0000 From: Nik Clayton User-Agent: Thunderbird 1.5 (X11/20060117) MIME-Version: 1.0 To: Ollivier Robert References: <20060304141957.14716.qmail@web32705.mail.mud.yahoo.com> <20060304152433.W61086@fledge.watson.org> <200603051930.25957.peter@wemm.org> <20060306102622.GB21025@tara.freenix.org> In-Reply-To: <20060306102622.GB21025@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 13:22:16 -0000 Ollivier Robert wrote: > According to Peter Wemm: >> Like perforce, it is fully client/server, but it has some considerable >> advantages over perforce: >> >> 1) It has fairly good detached operation modes. You can do logs, diffs, >> reverts, etc while detached. It does this by keeping metadata and a >> small number of revisions cached locally. > > In my opinion, it is not enough. You can't svn commit on a detached mode. > You can't work as if you were connected, commit several csets, go back one > and so on. That's too limiting. And when you need that, you use svk, which others have pointed out. Given a hypothetical FreeBSD Subversion repository you could choose to use either the Subversion project tools (which have that limitation that you need network access to the repo to commit) or you use svk, which lets you commit locally, and then propogate ("svk push") your locally committed changes back to the FreeBSD repo. >> The comments about svn's lack of branch merge memory make me a bit >> nervous though. We've had brahcnes that have been incrementally merged >> hundreds of times under perforce, and the lack of remembering which >> revisions have and have not been merged would be sorely missed. > > Yes. Fixed with svk. Fixed with contrib/svnmerge in Subversion. N