From owner-svn-src-all@FreeBSD.ORG  Fri Feb 17 03:47:14 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 74EFF1065670;
	Fri, 17 Feb 2012 03:47:14 +0000 (UTC)
	(envelope-from lists@eitanadler.com)
Received: from mail-we0-f182.google.com (mail-we0-f182.google.com
	[74.125.82.182])
	by mx1.freebsd.org (Postfix) with ESMTP id F0DD88FC22;
	Fri, 17 Feb 2012 03:47:12 +0000 (UTC)
Received: by werm13 with SMTP id m13so2523181wer.13
	for <multiple recipients>; Thu, 16 Feb 2012 19:47:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=eitanadler.com; s=0xdeadbeef;
	h=mime-version:sender:in-reply-to:references:from:date
	:x-google-sender-auth:message-id:subject:to:cc:content-type;
	bh=zzuT/8cogxnK0NHQKfvItZLlCKjVx7VBSu3YRnKCchQ=;
	b=SynVejZCnjVqKZN0vCDQrZUH+o0UN+d8rE9h9XM4ahv2JhTQJr+yNlGEw/vLZfd/AP
	CmLszHAbnNutqxp/s1BDIvEz+kQfvFztcL2u8EGQxbojevoB+UM+LSv0xyqwjbhdSN2F
	Y2W/qHYFHUsYX68deTPCvBGk8BP3+OjgeXZD0=
Received: by 10.180.92.73 with SMTP id ck9mr708452wib.2.1329450432202; Thu, 16
	Feb 2012 19:47:12 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.223.15.90 with HTTP; Thu, 16 Feb 2012 19:46:42 -0800 (PST)
In-Reply-To: <4F3DCCC9.4080908@FreeBSD.org>
References: <201201281948.q0SJmjIL096609@svn.freebsd.org>
	<20120215155011.GB2279@a91-153-116-96.elisa-laajakaista.fi>
	<CAF6rxgn8R8xLDGr+wzcnYOs=PUqWtB9YZgqqyK0b45VtKFSkqA@mail.gmail.com>
	<20120215160950.GC2279@a91-153-116-96.elisa-laajakaista.fi>
	<CAF6rxgmSSZ9h-eTYDAdg_AT-WepUScpXEYNCnaBhbU1xPnkf5Q@mail.gmail.com>
	<20120216092531.GA64733@jh> <4F3DC395.1050009@FreeBSD.org>
	<CAF6rxgn3mtTVD9NEg+zLscSRQ14rhFLDe0HnaMGSRjXg4EcOFg@mail.gmail.com>
	<4F3DCCC9.4080908@FreeBSD.org>
From: Eitan Adler <eadler@freebsd.org>
Date: Thu, 16 Feb 2012 22:46:42 -0500
X-Google-Sender-Auth: lksEiS8CmS0QFzn7XBnktNI1XPE
Message-ID: <CAF6rxgmicufgroOBLfYG62E3RbzMNM0V3X7ZjQXtgugSdyk0qw@mail.gmail.com>
To: Doug Barton <dougb@freebsd.org>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQmTZMOpgR7upXXzKv5sm3xq04mR2bRFiqbA/5prPmDu3aCexW/zzbKHghau5stwWLD3QHkZ
Cc: Jaakko Heinonen <jh@freebsd.org>, src-committers@freebsd.org,
	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 &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: Fri, 17 Feb 2012 03:47:14 -0000

On Thu, Feb 16, 2012 at 10:43 PM, Doug Barton <dougb@freebsd.org> wrote:
> 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 .'

Thank you.

> One could argue that they could have been merged into examples/, but
> usually those directories don't share anything in common (pun intended).

:)

-- 
Eitan Adler
Source & Ports committer
X11, Bugbusting teams