From owner-svn-src-head@FreeBSD.ORG Tue Dec 2 07:22:45 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 017BC106564A for ; Tue, 2 Dec 2008 07:22:45 +0000 (UTC) (envelope-from peter@wemm.org) Received: from rv-out-0506.google.com (rv-out-0506.google.com [209.85.198.237]) by mx1.freebsd.org (Postfix) with ESMTP id E32538FC17 for ; Tue, 2 Dec 2008 07:22:44 +0000 (UTC) (envelope-from peter@wemm.org) Received: by rv-out-0506.google.com with SMTP id b25so2790080rvf.43 for ; Mon, 01 Dec 2008 23:22:44 -0800 (PST) Received: by 10.142.52.9 with SMTP id z9mr4819533wfz.82.1228202564470; Mon, 01 Dec 2008 23:22:44 -0800 (PST) Received: by 10.142.255.21 with HTTP; Mon, 1 Dec 2008 23:22:44 -0800 (PST) Message-ID: Date: Mon, 1 Dec 2008 23:22:44 -0800 From: "Peter Wemm" To: "M. Warner Losh" In-Reply-To: <20081201.220808.1649770636.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200812020226.mB22QFtl045542@svn.freebsd.org> <20081201.220808.1649770636.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 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Dec 2008 07:22:45 -0000 On Mon, Dec 1, 2008 at 9:08 PM, M. Warner Losh wrote: > In message: <200812020226.mB22QFtl045542@svn.freebsd.org> > Peter Wemm 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