Date: Mon, 1 Dec 2008 23:22:44 -0800 From: "Peter Wemm" <peter@wemm.org> To: "M. Warner Losh" <imp@bsdimp.com> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r185539 - in head/sys: arm/at91 dev/mn kern security/mac security/mac_bsdextended Message-ID: <e7db6d980812012322o4c91314cl93681eaa5f1a91de@mail.gmail.com> In-Reply-To: <20081201.220808.1649770636.imp@bsdimp.com> References: <200812020226.mB22QFtl045542@svn.freebsd.org> <20081201.220808.1649770636.imp@bsdimp.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Dec 1, 2008 at 9:08 PM, M. Warner Losh <imp@bsdimp.com> wrote: > In message: <200812020226.mB22QFtl045542@svn.freebsd.org> > Peter Wemm <peter@FreeBSD.org> writes: > : Author: peter > : Date: Tue Dec 2 02:26:15 2008 > : New Revision: 185539 > : URL: http://svn.freebsd.org/changeset/base/185539 > : > : Log: > : Delete a bunch of empty mergeinfo records caused by local copies. > : > : Modified: > : head/sys/arm/at91/at91_machdep.c (props changed) > : head/sys/arm/at91/board_bwct.c (props changed) > : head/sys/arm/at91/board_hl200.c (props changed) > : head/sys/arm/at91/board_kb920x.c (props changed) > : head/sys/arm/at91/board_tsc4370.c (props changed) > : head/sys/arm/at91/std.bwct (props changed) > : head/sys/arm/at91/std.hl200 (props changed) > : head/sys/arm/at91/std.tsc4370 (props changed) > : head/sys/dev/mn/if_mn.c (props changed) > : head/sys/kern/kern_cons.c (props changed) > : head/sys/security/mac/mac_cred.c (props changed) > : head/sys/security/mac_bsdextended/ugidfw_system.c (props changed) > : head/sys/security/mac_bsdextended/ugidfw_vnode.c (props changed) > > Is there some way the developer that does the copies can do this so > you don't need to do this? Yes. It sounds strange, but specify a full repo-relative path. instead of: $ cd head/sys/kern $ svn cp kern_tty.c kern_cons.c $ ..stuff.. $ svn commit you should do this: $ cd head/sys/kern $ svn cp $REPO/head/sys/kern/kern_tty.c kern_cons.c $ ..stuff.. $ svn commit The difference is that in the second form the command can chase inherited mergeinfo around wherever it may lead and make sure that side effects are accounted for. In the first form, the command doesn't have access to mergeinfo inheritance info so it has to make an empty 'I have no idea!' mergeinfo to block any inheritance that *might* be there. -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6FJV "All of this is for nothing if we don't go to the stars" - JMS/B5 "If Java had true garbage collection, most programs would delete themselves upon execution." -- Robert Sewell
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e7db6d980812012322o4c91314cl93681eaa5f1a91de>