From owner-freebsd-current@FreeBSD.ORG  Sun Nov  7 13:53:31 2010
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3632F1065695;
	Sun,  7 Nov 2010 13:53:31 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2001:470:9a47::1])
	by mx1.freebsd.org (Postfix) with ESMTP id A7F1A8FC08;
	Sun,  7 Nov 2010 13:53:30 +0000 (UTC)
Received: from acme.spoerlein.net (localhost.spoerlein.net [IPv6:::1])
	by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id oA7DrTnw094458
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Sun, 7 Nov 2010 14:53:29 +0100 (CET)
	(envelope-from uqs@spoerlein.net)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net;
	s=dkim200908; t=1289138009;
	bh=jvLTowREG6Ur5MQOOP8Z8tTu6rVrtCircfFLxLtRCkc=;
	h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type;
	b=hm1ON2iUR5Fuq6HsdXUYYITuQtFCxselZ3v7Z317smOq040Jc8Ng2XoCv0JxEcJfo
	/hyvTOcQ9iOXBoLhfvHY/tf6yYUu0nDzOubI4t4vh5dtv2Nel+1JBGW4DV32ZULO3w
	AP8kAUcQXB/SH5qZEE0yPPaaGiv8F+kYC4/CMZIs=
Received: (from uqs@localhost)
	by acme.spoerlein.net (8.14.4/8.14.4/Submit) id oA7DrTte094457;
	Sun, 7 Nov 2010 14:53:29 +0100 (CET)
	(envelope-from uqs@spoerlein.net)
Date: Sun, 7 Nov 2010 14:53:29 +0100
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net>
To: current@FreeBSD.org, fanf@FreeBSD.org
Message-ID: <20101107135329.GL85693@acme.spoerlein.net>
Mail-Followup-To: current@FreeBSD.org, fanf@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: 
Subject: Tricky subversion import, what to do?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Nov 2010 13:53:31 -0000

Hello,

this is about importing unifdef 2.4, which has no significant code
changes, but that's not the point. The wiki is of no help for this
particular case.

We have no exclusive vendor branch for unifdef, instead it has been
converted to svn under vendor/CSRG/dist/usr.bin/unifdef/ and some parts of
its history (eg. r1591) are copied from there:

   A /head/usr.bin/unifdef/Makefile (from /vendor/CSRG/dist/usr.bin/unifdef/Makefile:1590)
   A /head/usr.bin/unifdef/unifdef.1 (from /vendor/CSRG/dist/usr.bin/unifdef/unifdef.1:1590)
   A /head/usr.bin/unifdef/unifdef.c (from /vendor/CSRG/dist/usr.bin/unifdef/unifdef.c:1590)

So, my first instinct would be to

$ svn mv $FSVN/vendor/CSRG/dist/usr.bin/unifdef $FSVN/vendor/unifdef/dist
(put all files (or just the necessary subset?) of unifdef-2.4 in vendor/unifdef/dist)
$ svn ci
$ svn cp $FSVN/vendor/unifdef/dist $FSVN/vendor/unifdef/2.4
$ svn cp $FSVN/vendor/unifdef/dist/unifdef.{c,1} $FSVN/head/contrib/unifdef/
$ svn rm head/usr.bin/unifdef/unifdef.{c,1}
(but this part loses the actual history on head, as it was never
committed to the vendor branch)
(update usr.bin/unidef/Makefile to point to contrib/unifdef)
$ svn ci

But then again, the first steps could also be:
$ svn cp head/usr.bin/unifdef vendor/unifdef/dist; svn ci
$ svn cp vendor/unifdef/dist vendor/unifdef/2.3; svn ci

This seems more reasonable to me, but I'm not sure what the policy is on
"old stuff" under vendor/