From owner-freebsd-current@FreeBSD.ORG Thu Oct 4 18:17:17 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 99D16106566B for ; Thu, 4 Oct 2012 18:17:17 +0000 (UTC) (envelope-from seanbru@yahoo-inc.com) Received: from mrout2-b.corp.bf1.yahoo.com (mrout2-b.corp.bf1.yahoo.com [98.139.253.105]) by mx1.freebsd.org (Postfix) with ESMTP id 4F0C48FC1A for ; Thu, 4 Oct 2012 18:17:17 +0000 (UTC) Received: from [IPv6:::1] (rideseveral.corp.yahoo.com [10.73.160.231]) by mrout2-b.corp.bf1.yahoo.com (8.14.4/8.14.4/y.out) with ESMTP id q94IH0Hl007620; Thu, 4 Oct 2012 11:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yahoo-inc.com; s=cobra; t=1349374621; bh=fSQsIqZMbdtAT5DuGzeZ+yqGvQK7GiE09jMiQvKzAR8=; h=Subject:From:Reply-To:To:Cc:In-Reply-To:References:Content-Type: Date:Message-ID:Mime-Version:Content-Transfer-Encoding; b=lJJDtc/ix2Qiw88S2HYEfNnmBHMBJUHGH/sGibhqaNp7Fhn0j9mnvRkUummdTmwwH P7PztWPddIviwbQVuE/gzFUr8RZ6DgZRO1Y0XGQnlOhOjQthqeOXnisWw4fXFwdfKw gfaJiaSw/TLkPbGw5tL36628oJdGZLrBoD0/I5QY= From: Sean Bruno To: Rick Macklem In-Reply-To: <1597538279.1739903.1349374211640.JavaMail.root@erie.cs.uoguelph.ca> References: <1597538279.1739903.1349374211640.JavaMail.root@erie.cs.uoguelph.ca> Content-Type: text/plain; charset="UTF-8" Date: Thu, 04 Oct 2012 11:16:59 -0700 Message-ID: <1349374619.5234.0.camel@powernoodle.corp.yahoo.com> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Milter-Version: master.31+4-gbc07cd5+ X-CLX-ID: 374620005 Cc: FreeBSD-Current Subject: Re: svn MFC to stable/8 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: sbruno@freebsd.org 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:17:17 -0000 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