From owner-svn-src-all@FreeBSD.ORG Mon Jul 13 15:32:41 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF281106564A; Mon, 13 Jul 2009 15:32:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id ACE6A8FC21; Mon, 13 Jul 2009 15:32:41 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 6129246B37; Mon, 13 Jul 2009 11:32:41 -0400 (EDT) Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 1CECB8A096; Mon, 13 Jul 2009 11:32:40 -0400 (EDT) From: John Baldwin To: Brian Somers Date: Mon, 13 Jul 2009 11:18:59 -0400 User-Agent: KMail/1.9.7 References: <200907090912.n699CGx0077581@svn.freebsd.org> <200907092235.18828.max@love2party.net> <20090710013243.68775e75@dev.lan.Awfulhak.org> In-Reply-To: <20090710013243.68775e75@dev.lan.Awfulhak.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200907131119.00579.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Mon, 13 Jul 2009 11:32:40 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Konstantin Belousov , Max Laier Subject: Re: svn commit: r195485 - in stable/7/sys: . contrib/pf kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2009 15:32:42 -0000 On Friday 10 July 2009 4:32:43 am Brian Somers wrote: > we might need to import it in two pieces so that we can maintain the > contrib/some-package part of the hierarchy when merging sys/, even > though the other two hierarchies can be merged directly into src/etc > and usr.bin/program directly. We actually already have that split up since vendor and vendor-sys are separate. However, I think the idea was to try to keep the trees under vendor and vendor-sys as pristine as possible. > However, the bit that I don't understand about the original commit and > its update of the contrib/pf mergeinfo is why it's updated at all by svn > - it just seems wrong. When I do: > > cd svn/stable/7/sys > svn merge -c NNNNN ^/head/sys > > given that change NNNNN has nothing to do with pf, I don't understand > why subversion updates stable/7/sys/contrib/pf's mergeinfo. Is the > "special" thing about sys/contrib/pf just that it already has mergeinfo > associated with it? And if so, why does that make it special. Surely > having NNNNN in sys's mergeinfo implies that it's been merged to > every part beneath sys. No, mergeinfo is _not_ inherited, so the mergeinfo for sys/ has to be duplicated in sys/contrib/pf. -- John Baldwin