From owner-freebsd-current@FreeBSD.ORG  Thu Oct  4 19:31:33 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DCEBF1065672
	for <freebsd-current@freebsd.org>; Thu,  4 Oct 2012 19:31:33 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
	[IPv6:2001:470:1f10:75::2])
	by mx1.freebsd.org (Postfix) with ESMTP id B2F8E8FC16
	for <freebsd-current@freebsd.org>; Thu,  4 Oct 2012 19:31:33 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id D8A48B946;
	Thu,  4 Oct 2012 15:31:32 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: freebsd-current@freebsd.org
Date: Thu, 4 Oct 2012 14:57:09 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p20; KDE/4.5.5; amd64; ; )
References: <1597538279.1739903.1349374211640.JavaMail.root@erie.cs.uoguelph.ca>
In-Reply-To: <1597538279.1739903.1349374211640.JavaMail.root@erie.cs.uoguelph.ca>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201210041457.09340.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
	(bigwig.baldwin.cx); Thu, 04 Oct 2012 15:31:32 -0400 (EDT)
Cc: Rick Macklem <rmacklem@uoguelph.ca>
Subject: Re: svn MFC to stable/8
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2012 19:31:34 -0000

On Thursday, October 04, 2012 2:10:11 pm Rick Macklem wrote:
> Hi,
> 
> Hopefully someone familiar with svn can help. When I try to MFC
> a kernel change to stable/8, it works, but I end up with tons of
> mergeinfo. (It looks like every directory under sys.)
> 
> Does this matter or is there a trick to avoid this?
> 
> Thanks in advance for any help, rick
> ps: I seem to MFC fine to stable/9. I only see this for stable/8.

Someone screwed up the mergeinfo on stable/8/sys/dev due to svn 1.6
not working well with newer merges from 1.7.  The simplest solution
is to just update your client to svn 1.7.  Otherwise, you can commit
what you have now with 1.6.

-- 
John Baldwin