From owner-svn-src-all@FreeBSD.ORG Fri Feb 17 06:33:34 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6723106564A; Fri, 17 Feb 2012 06:33:34 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from gw01.mail.saunalahti.fi (gw01.mail.saunalahti.fi [195.197.172.115]) by mx1.freebsd.org (Postfix) with ESMTP id 517E28FC12; Fri, 17 Feb 2012 06:33:34 +0000 (UTC) Received: from a91-153-116-96.elisa-laajakaista.fi (a91-153-116-96.elisa-laajakaista.fi [91.153.116.96]) by gw01.mail.saunalahti.fi (Postfix) with SMTP id D7CE11514DC; Fri, 17 Feb 2012 08:33:23 +0200 (EET) Date: Fri, 17 Feb 2012 08:33:21 +0200 From: Jaakko Heinonen To: Doug Barton Message-ID: <20120217063321.GA2273@a91-153-116-96.elisa-laajakaista.fi> 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> <4F3DCCC9.4080908@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4F3DCCC9.4080908@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: src-committers@freebsd.org, Eitan Adler , 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2012 06:33:35 -0000 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 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