From owner-svn-src-all@FreeBSD.ORG Fri Feb 17 03:03:53 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 8A15D106566C; Fri, 17 Feb 2012 03:03:53 +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 8887B152478; Fri, 17 Feb 2012 03:03:50 +0000 (UTC) Message-ID: <4F3DC395.1050009@FreeBSD.org> Date: Thu, 16 Feb 2012 19:03:49 -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: Jaakko Heinonen 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> In-Reply-To: <20120216092531.GA64733@jh> X-Enigmail-Version: 1.3.5 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 03:03:53 -0000 On 02/16/2012 01:25, Jaakko Heinonen wrote: > On 2012-02-15, Eitan Adler wrote: >> On Wed, Feb 15, 2012 at 11:09 AM, Jaakko Heinonen wrote: >>> On 2012-02-15, Eitan Adler wrote: >>>> On Wed, Feb 15, 2012 at 10:50 AM, Jaakko Heinonen wrote: >>>> >>>>> I think this commit incorrectly placed mergeinfo to stable/9/share/. >>>> >>>> I used the following command: >>>> >>>> 2811 svn merge -c229831 $FSVN/head/share share >>>> >>>> Should I have committed somewhere else? >>>> http://wiki.freebsd.org/SubversionPrimer/Merging is not particularly >>>> helpful for share/ changes. >>> >>> Looking at previous merges I would have merged it to share/examples. >> >> I updated the wiki (see #11) and thanks for the help. > > I think that the mergeinfo from stable/9/share could be just deleted. > Unless I am mistaken there hasn't been merges that would place mergeinfo > only to stable/9/share after r230653. > > Could someone confirm that this is the right thing to do? The mergeinfo should be placed in the correct location first, but then it can be removed from share/, yes. -- 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/