From owner-freebsd-current@FreeBSD.ORG Thu Oct 4 22:06:58 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 50B5B106566B; Thu, 4 Oct 2012 22:06:58 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from esa-annu.mail.uoguelph.ca (esa-annu.mail.uoguelph.ca [131.104.91.36]) by mx1.freebsd.org (Postfix) with ESMTP id E11A38FC1C; Thu, 4 Oct 2012 22:06:57 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap8EADoHblCDaFvO/2dsb2JhbABFhg+6D4IgAQEBBAEBASArIAsbDgoCAg0ZAikBCSYGCAcEARoCBIdkC6UxknSBIYodGoRxgRIDkzyCLYEVjxeDCYFHNA X-IronPort-AV: E=Sophos;i="4.80,537,1344225600"; d="scan'208";a="184770855" Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.206]) by esa-annu-pri.mail.uoguelph.ca with ESMTP; 04 Oct 2012 18:06:56 -0400 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id 8B754B4045; Thu, 4 Oct 2012 18:06:56 -0400 (EDT) Date: Thu, 4 Oct 2012 18:06:56 -0400 (EDT) From: Rick Macklem To: John Baldwin Message-ID: <1794336473.1759341.1349388416433.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: <201210041457.09340.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [172.17.91.203] X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0 (Win)/6.0.10_GA_2692) 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: Thu, 04 Oct 2012 22:06:58 -0000 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. rick > -- > John Baldwin > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to > "freebsd-current-unsubscribe@freebsd.org"