From owner-svn-src-stable@FreeBSD.ORG  Wed Nov 10 17:30:33 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from hub.freebsd.org (localhost [127.0.0.1])
	by hub.freebsd.org (Postfix) with ESMTP id 884261065674;
	Wed, 10 Nov 2010 17:30:32 +0000 (UTC)
	(envelope-from nork@FreeBSD.org)
Date: Thu, 11 Nov 2010 02:30:26 +0900
From: Norikatsu Shigemura <nork@FreeBSD.org>
To: John Baldwin <jhb@freebsd.org>
Message-Id: <20101111023026.371a5d52.nork@FreeBSD.org>
In-Reply-To: <201011101200.07324.jhb@freebsd.org>
References: <201011100522.oAA5MDLb084941@svn.freebsd.org>
	<4CDA3247.1000608@freebsd.org>
	<20101111014721.bc6556e1.nork@FreeBSD.org>
	<201011101200.07324.jhb@freebsd.org>
X-Mailer: Sylpheed 3.0.3 (GTK+ 2.20.1; i386-portbld-freebsd8.1)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: src-committers@freebsd.org, svn-src-stable@freebsd.org,
	svn-src-all@freebsd.org, Norikatsu Shigemura <nork@freebsd.org>,
	Andriy Gapon <avg@freebsd.org>, svn-src-stable-8@freebsd.org,
	imp@freebsd.org
Subject: Re: svn commit: r215077 - in stable/8: . contrib/top
 etc/periodic/daily gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin
 sbin/geom/class/sched sys/modules tools/regression/lib/msun
 tools/regress...
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Nov 2010 17:30:34 -0000

On Wed, 10 Nov 2010 12:00:07 -0500
John Baldwin <jhb@freebsd.org> wrote:
> > 	So I'll contact to mentor, and remove svn:mergeinfo (r211201,
> > 	r211204, r211270-r211271, r212861, r211249) from src/ exclude
> > 	src/sys.
> If you want to fix the mergeinfo, the easiest way I've found to do so, is to 
> do 'svn merge --record-only -c-<xxxxx>' for each of the changes.  Then go back 
> and redo the svn merges to the proper locations using '--record-only'.  This 
> should only affect mergeinfo and nothing else.

	Thank you!
	I'll confirm operations you said, and test on my local environment.

-- 
Norikatsu Shigemura <nork@FreeBSD.org>