From owner-svn-src-all@FreeBSD.ORG Thu Feb 16 09:25:40 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 6E43D106566C; Thu, 16 Feb 2012 09:25:40 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from gw02.mail.saunalahti.fi (gw02.mail.saunalahti.fi [195.197.172.116]) by mx1.freebsd.org (Postfix) with ESMTP id ED7758FC0A; Thu, 16 Feb 2012 09:25:39 +0000 (UTC) Received: from jh (a91-153-115-208.elisa-laajakaista.fi [91.153.115.208]) by gw02.mail.saunalahti.fi (Postfix) with ESMTP id 2D6E41395AF; Thu, 16 Feb 2012 11:25:32 +0200 (EET) Date: Thu, 16 Feb 2012 11:25:31 +0200 From: Jaakko Heinonen To: Eitan Adler Message-ID: <20120216092531.GA64733@jh> References: <201201281948.q0SJmjIL096609@svn.freebsd.org> <20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi> <20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@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: Thu, 16 Feb 2012 09:25:40 -0000 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? %%% Property changes on: share ___________________________________________________________________ Deleted: svn:mergeinfo Reverse-merged /head/share:r226702,227006,228761,229067,229831,229997,230127,230587,231111,231331 Reverse-merged /vendor/resolver/dist/share:r1540-186085 Reverse-merged /projects/largeSMP/share:r221273-222812,222815-223757 Reverse-merged /projects/quota64/share:r184125-207707 %%% -- Jaakko