From owner-svn-src-stable-9@FreeBSD.ORG Fri Feb 17 03:43:07 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 0DEF4106566C; Fri, 17 Feb 2012 03:43:07 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-150-251.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 8410114DC58; Fri, 17 Feb 2012 03:43:05 +0000 (UTC) Message-ID: <4F3DCCC9.4080908@FreeBSD.org> Date: Thu, 16 Feb 2012 19:43:05 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:10.0.1) Gecko/20120213 Thunderbird/10.0.1 MIME-Version: 1.0 To: Eitan Adler References: <201201281948.q0SJmjIL096609@svn.freebsd.org> <20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi> <20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi> <20120216092531.GA64733@jh> <4F3DC395.1050009@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.3.5 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Jaakko Heinonen , src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, svn-src-stable-9@freebsd.org, cperciva@freebsd.org Subject: Re: svn commit: r230653 - in stable/9: lib/libopie share/examples/diskless share/examples/ppp share/examples/printing tools/tools/nanobsd/pcengines/Files/root usr.sbin/pkg_install/add X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2012 03:43:07 -0000 On 02/16/2012 19:07, Eitan Adler wrote: > On Thu, Feb 16, 2012 at 10:03 PM, Doug Barton wrote: >> The mergeinfo should be placed in the correct location first, but then >> it can be removed from share/, yes. > > How? I went ahead and did it for you. In share/ I did 'svn propedit svn:mergeinfo .' and removed the relevant entry. Then in each of the directories in examples I did, 'svn merge --record-only -c 228931 $REPO/head/share/examples/ppp .' One could argue that they could have been merged into examples/, but usually those directories don't share anything in common (pun intended). Doug -- It's always a long day; 86400 doesn't fit into a short. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/