From owner-svn-src-projects@FreeBSD.ORG Wed Jan 20 13:03:49 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85D9A1065672 for ; Wed, 20 Jan 2010 13:03:49 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.freebsd.org (Postfix) with ESMTP id 17CBA8FC22 for ; Wed, 20 Jan 2010 13:03:49 +0000 (UTC) Received: from vampire.homelinux.org (dslb-088-064-190-015.pools.arcor-ip.net [88.64.190.15]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MW7C9-1NMjBx021p-00XQxN; Wed, 20 Jan 2010 13:51:12 +0100 Received: (qmail 43737 invoked from network); 20 Jan 2010 12:51:11 -0000 Received: from f8x64.laiers.local (192.168.4.188) by ns1.laiers.local with SMTP; 20 Jan 2010 12:51:11 -0000 From: Max Laier Organization: FreeBSD To: Jeff Roberson Date: Wed, 20 Jan 2010 13:51:09 +0100 User-Agent: KMail/1.12.4 (FreeBSD/8.0-RELEASE-p2; KDE/4.3.4; amd64; ; ) References: <201001200949.o0K9nsgX076781@svn.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201001201351.10007.max@love2party.net> X-Provags-ID: V01U2FsdGVkX19Oqyv6Xl/sHbBRCDz/QKgkxwpKJH2dammHOY7 Ut5AJ4z9cgqWX/oGh1DOEtf3KFxx9BhgY8a42bHjOP+pfvU2U9 CCScHdMHFtrmdItce7y4Q== Cc: svn-src-projects@freebsd.org, Jeff Roberson , src-committers@freebsd.org Subject: Re: svn commit: r202688 - in projects/suj/8: . contrib/top lib/libufs lib/libusb sbin/fsck_ffs sbin/fsdb sbin/mount sbin/tunefs share/man/man4 sys/kern sys/sys sys/ufs/ffs sys/ufs/ufs tools/regression/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2010 13:03:49 -0000 On Wednesday 20 January 2010 10:57:48 Jeff Roberson wrote: > On Wed, 20 Jan 2010, Jeff Roberson wrote: > > Author: jeff > > Date: Wed Jan 20 09:49:53 2010 > > New Revision: 202688 > > URL: http://svn.freebsd.org/changeset/base/202688 > > > > Log: > > - Merge SUJ from the private head branch to the private 8 branch. > > Can someone tell me what's up with all the property changes? Is it > because I didn't do one merge for each top level directory I care about? When in doubt, just believe that subversion DTRT. It does here. The mergeinfo changes you are seeing are just to update already existing mergeinfo properties in your branched tree. Since you merged at root, every place that has mergeinfo needs to be updated. The copied mergeinfo is helpful, too. This way you can check for merged and eligible revisions from head in you project branch. E.g. to find out if there are missing patches to fsck_ffs: cd $wcbase/projects/suj/8/sbin/fsck_ffs svn mergeinfo --show-revs eligible $repo/head/sbin/fsck_ffs now if you merge missing patches in your branch and later merge your branch to stable/8, this info will also be propagated. -- Max