From owner-freebsd-arch@FreeBSD.ORG Sat Mar 4 23:42:58 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 6193A16A420 for ; Sat, 4 Mar 2006 23:42:58 +0000 (GMT) (envelope-from tamaru@myn.rcast.u-tokyo.ac.jp) Received: from mail0.ecc.u-tokyo.ac.jp (mail0.ecc.u-tokyo.ac.jp [133.11.50.199]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32FF543D49 for ; Sat, 4 Mar 2006 23:42:51 +0000 (GMT) (envelope-from tamaru@myn.rcast.u-tokyo.ac.jp) Received: from spam001.ecc.u-tokyo.ac.jp (spam001.ecc.u-tokyo.ac.jp [133.11.50.194]) by mail0.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id 03A5C57C0B5 for ; Sun, 5 Mar 2006 08:42:50 +0900 (JST) Received: from 157.82.72.158 (157.82.72.158 [157.82.72.158]) by spam001.ecc.u-tokyo.ac.jp (SpamBlock.pst 3.4.90.0) with ESMTP id for ; Sun, 5 Mar 2006 08:42:18 +0900 Date: Sun, 05 Mar 2006 08:42:18 +0900 Message-ID: From: Hiroharu Tamaru To: Stijn Hoop In-Reply-To: <20060304212423.GD46967@pcwin002.win.tue.nl> References: <20060304141957.14716.qmail@web32705.mail.mud.yahoo.com> <20060304152433.W61086@fledge.watson.org> <20060304174835.GA58184@thened.net> <20060304194030.GA2826@tara.freenix.org> <20060304212423.GD46967@pcwin002.win.tue.nl> User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.3 Mule/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-IP: 157.82.72.158 X-FROM-DOMAIN: myn.rcast.u-tokyo.ac.jp X-FROM-EMAIL: tamaru@myn.rcast.u-tokyo.ac.jp 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: Sat, 04 Mar 2006 23:42:58 -0000 Allow me to just jump in... At Sat, 4 Mar 2006 22:24:23 +0100, Stijn Hoop wrote: > > But you don't know when (time or changeset based) you did branch something. > > This is bad IMO. > > Eh? Where did you get that impression? Did you test this? > > %%% > [stijn@tangaloor] <~> svn log -r 415 https://svn.sandcat.nl/repos/sws/tags/SWS_0_4_2 > ------------------------------------------------------------------------ > r415 | stijn | 2005-01-06 12:21:04 +0100 (Thu, 06 Jan 2005) | 3 lines > > - Tag 0.4.2 for BCF use > > [stijn@tangaloor] <~> svn log https://svn.sandcat.nl/repos/sws/tags/SWS_0_4_2/include/main.php > ------------------------------------------------------------------------ > r415 | stijn | 2005-01-06 12:21:04 +0100 (Thu, 06 Jan 2005) | 3 lines > > - Tag 0.4.2 for BCF use > > > ------------------------------------------------------------------------ > r411 | stijn | 2004-12-07 13:57:39 +0100 (Tue, 07 Dec 2004) | 20 lines > > ... > %%% > > Maybe I'm misunderstanding you, but that seems to me to be the > information you were looking for. Yes, you can find out where your banches came from, but IIRC, you cannot find out what happened to all the branches, when you are looking at it from the trunk, or what's happening on trunk by looking at a branch. I find it invaluable to see which feature is backported to which branches when I look into the FreeBSD cvsweb pages. Is there any way, when you specify https://svn.sandcat.nl/repos/sws/trunk/include/main.php ~~~~~~~ that you'd know if there are any branches that have this file forked off from its trunk version, or know if and when the change made at revision foo (on trunk) was merged to a branch by looking at the log on the *trunk side* (you need it especially when you are not aware that such a branch exists). I assume the latter would be solved when they support 'real-merging' (as they plan to), but what about the former? I'd loved to prooved wrong, since this is about the only thing I miss with subversion. Or, well, vendor-branch may be another one.. Has the 'import' function changed to allow an update to a vendor branch now, or do you need 'svn remove' on each deleted file and 'svn add' on each added file? -- Hiroharu Tamaru