From owner-freebsd-current@FreeBSD.ORG Fri Oct 5 16:17:36 2012 Return-Path: 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 B6A09106566C for ; Fri, 5 Oct 2012 16:17:36 +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 8C80C8FC19 for ; Fri, 5 Oct 2012 16:17:36 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id E651CB949; Fri, 5 Oct 2012 12:17:35 -0400 (EDT) From: John Baldwin To: Rick Macklem Date: Fri, 5 Oct 2012 11:46:33 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p20; KDE/4.5.5; amd64; ; ) References: <1794336473.1759341.1349388416433.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: <1794336473.1759341.1349388416433.JavaMail.root@erie.cs.uoguelph.ca> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201210051146.33771.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 05 Oct 2012 12:17:36 -0400 (EDT) Cc: freebsd-current@freebsd.org 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2012 16:17:36 -0000 On Thursday, October 04, 2012 6:06:56 pm Rick Macklem wrote: > John Baldwin wrote: > > 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. > > > Thanks yet again John. I used svn1.7 and it didn't have all the dirs. > It only listed directory properties for sys and sys/fs, > which I hope was ok, since I committed it. Yep. -- John Baldwin