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

Jaakko Heinonen jh at FreeBSD.org
Fri Feb 17 06:33:35 UTC 2012


On 2012-02-16, Doug Barton wrote:
> 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

Why this is necessary? r230653 recorded mergeinfo also to
share/examples. A snippet from diff:

Modified: svn:mergeinfo
   Merged /head/share/examples:r229831

> 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 .'

Thanks, but stable/9/share still has the svn:mergeinfo property after
r231856. It didn't have it before r230653.

-- 
Jaakko


More information about the svn-src-all mailing list