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

Doug Barton dougb at FreeBSD.org
Fri Feb 17 03:43:07 UTC 2012


On 02/16/2012 19:07, Eitan Adler wrote:
> On Thu, Feb 16, 2012 at 10:03 PM, Doug Barton <dougb at freebsd.org> 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/



More information about the svn-src-stable-9 mailing list