From owner-svn-src-all@FreeBSD.ORG Fri Jul 10 11:19:21 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 C4BC71065675; Fri, 10 Jul 2009 11:19:21 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id 7410F8FC08; Fri, 10 Jul 2009 11:19:21 +0000 (UTC) (envelope-from des@des.no) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id B81726D418; Fri, 10 Jul 2009 13:19:20 +0200 (CEST) Received: by ds4.des.no (Postfix, from userid 1001) id 8BDD2844B5; Fri, 10 Jul 2009 13:19:20 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Brian Somers References: <200907090912.n699CGx0077581@svn.freebsd.org> <20090709103126.02bf7206@Awfulhak.org> <200907092235.18828.max@love2party.net> <20090710013243.68775e75@dev.lan.Awfulhak.org> Date: Fri, 10 Jul 2009 13:19:20 +0200 In-Reply-To: <20090710013243.68775e75@dev.lan.Awfulhak.org> (Brian Somers's message of "Fri, 10 Jul 2009 01:32:43 -0700") Message-ID: <86ws6gu6o7.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.92 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: src-committers@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable-7@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: Fri, 10 Jul 2009 11:19:25 -0000 Brian Somers writes: > 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 > [...] Because svn needs to record that the revision you merged into sys was also merged into sys/contrib/pf. > Having said all that, svn's --depth switch allows partially sparse tree > checkouts, and it's always possible to svn revert part of a merge > before committing. Don't. You'd just make things worse. Read http://wiki.freebsd.org/SubversionPrimer and its subpages. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no