Date: Fri, 10 Jul 2009 13:19:20 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Brian Somers <brian@FreeBSD.org> Cc: src-committers@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable-7@FreeBSD.org, Konstantin Belousov <kib@FreeBSD.org>, Max Laier <max@love2party.net> Subject: Re: svn commit: r195485 - in stable/7/sys: . contrib/pf kern Message-ID: <86ws6gu6o7.fsf@ds4.des.no> In-Reply-To: <20090710013243.68775e75@dev.lan.Awfulhak.org> (Brian Somers's message of "Fri, 10 Jul 2009 01:32:43 -0700") References: <200907090912.n699CGx0077581@svn.freebsd.org> <20090709103126.02bf7206@Awfulhak.org> <200907092235.18828.max@love2party.net> <20090710013243.68775e75@dev.lan.Awfulhak.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Brian Somers <brian@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86ws6gu6o7.fsf>