From owner-svn-src-all@FreeBSD.ORG  Wed Feb 15 16:10:00 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 4FEF4106564A;
	Wed, 15 Feb 2012 16:10:00 +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 AF3AE8FC15;
	Wed, 15 Feb 2012 16:09:59 +0000 (UTC)
Received: from a91-153-116-96.elisa-laajakaista.fi
	(a91-153-116-96.elisa-laajakaista.fi [91.153.116.96])
	by gw02.mail.saunalahti.fi (Postfix) with SMTP id 06AF4176287;
	Wed, 15 Feb 2012 18:09:51 +0200 (EET)
Date: Wed, 15 Feb 2012 18:09:51 +0200
From: Jaakko Heinonen <jh@FreeBSD.org>
To: Eitan Adler <eadler@freebsd.org>
Message-ID: <20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi>
References: <201201281948.q0SJmjIL096609@svn.freebsd.org>
	<20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi>
	<CAF6rxgn8R8xLDGr+wzcnYOs=PUqWtB9YZgqqyK0b45VtKFSkqA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAF6rxgn8R8xLDGr+wzcnYOs=PUqWtB9YZgqqyK0b45VtKFSkqA@mail.gmail.com>
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Feb 2012 16:10:00 -0000

On 2012-02-15, Eitan Adler wrote:
> On Wed, Feb 15, 2012 at 10:50 AM, Jaakko Heinonen <jh@freebsd.org> 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.

-- 
Jaakko