Date: Wed, 20 Jan 2010 13:51:09 +0100 From: Max Laier <max@love2party.net> To: Jeff Roberson <jroberson@jroberson.net> Cc: svn-src-projects@freebsd.org, Jeff Roberson <jeff@freebsd.org>, 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/... Message-ID: <201001201351.10007.max@love2party.net> In-Reply-To: <alpine.BSF.2.00.1001192357070.1027@desktop> References: <201001200949.o0K9nsgX076781@svn.freebsd.org> <alpine.BSF.2.00.1001192357070.1027@desktop>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001201351.10007.max>