From owner-freebsd-current@FreeBSD.ORG Thu Oct 4 18:35:48 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 C2BA2106566C; Thu, 4 Oct 2012 18:35:48 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca [131.104.91.44]) by mx1.freebsd.org (Postfix) with ESMTP id 5F83B8FC08; Thu, 4 Oct 2012 18:35:47 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap4EAOvVbVCDaFvO/2dsb2JhbABFhg+6BYIgAQEFI1YbGAICDRkCWRmIBaU3kn6BIY0Zgg+BEgOVaZAsgwmBew X-IronPort-AV: E=Sophos;i="4.80,537,1344225600"; d="scan'208";a="182044519" Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.206]) by esa-jnhn-pri.mail.uoguelph.ca with ESMTP; 04 Oct 2012 14:35:47 -0400 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id 481DCB4032; Thu, 4 Oct 2012 14:35:47 -0400 (EDT) Date: Thu, 4 Oct 2012 14:35:47 -0400 (EDT) From: Rick Macklem To: sbruno@freebsd.org Message-ID: <1605359247.1742784.1349375747279.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: <1349374619.5234.0.camel@powernoodle.corp.yahoo.com> 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 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 18:35:48 -0000 Sean Bruno wrote: > On Thu, 2012-10-04 at 11:10 -0700, 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. > > _______________________________________________ > > Can you post your attempted svn merge command? > > Sean Same as I've always used. When at the top of an updated stable/8 checkout tree... # svn merge -c240720 svn+ssh://rmacklem@svn.freebsd.org/base/head/sys sys Also, after I reverse merge via: # svn merge -c-240720 svn+ssh://rmacklem@svn.freebsd.org/base/head/sys sys # svn status . M sys M sys/dev/sound - so I end up doing an "rm -r" of the tree, followed by a fresh checkout. (Before, the status wouldn't see anything modified after I would reverse the merge out.) rick