From owner-svn-src-stable@FreeBSD.ORG Tue May 22 18:42:16 2012 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDBE8106566B; Tue, 22 May 2012 18:42:16 +0000 (UTC) (envelope-from seanbru@yahoo-inc.com) Received: from mrout1-b.corp.bf1.yahoo.com (mrout1-b.corp.bf1.yahoo.com [98.139.253.104]) by mx1.freebsd.org (Postfix) with ESMTP id 5F2DE8FC0A; Tue, 22 May 2012 18:42:16 +0000 (UTC) Received: from [IPv6:::1] (rideseveral.corp.yahoo.com [10.73.160.231]) by mrout1-b.corp.bf1.yahoo.com (8.14.4/8.14.4/y.out) with ESMTP id q4MIfwu2098025; Tue, 22 May 2012 11:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yahoo-inc.com; s=cobra; t=1337712119; bh=zb7WRBswLMGn0sHRAWA5HjXvvDyXZnjH4b2a9VcRW3w=; h=Subject:From:To:Cc:In-Reply-To:References:Content-Type:Date: Message-ID:Mime-Version:Content-Transfer-Encoding; b=i/NOb+R8MR3MWdAIRSaVZppdvxpltUZLSEJ1+iqaDaS1sw6nvO4u5xfyEz139jF5D ObncCX50YBHnYECrCXf0MJLBxdxiQ+VHIkpAyU3Q0MnLtTc1hsGrWSWI75gLtFU6Nf HAJypifhWKKBbOPkHUD9LZSeHpcd+G2Y7Yi2rLLE= From: Sean Bruno To: John Baldwin In-Reply-To: <4FBAD919.2010706@FreeBSD.org> References: <201205211958.q4LJweXG070838@svn.freebsd.org> <201205211718.34896.jhb@freebsd.org> <4FBAD919.2010706@FreeBSD.org> Content-Type: text/plain; charset="UTF-8" Date: Tue, 22 May 2012 11:41:57 -0700 Message-ID: <1337712117.2916.10.camel@powernoodle-l7.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: 712118000 Cc: "svn-src-stable@FreeBSD.org" , Sean Bruno , "src-committers@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "svn-src-stable-9@FreeBSD.org" Subject: Re: svn commit: r235738 - in stable/9/sys: . dev/mfi X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2012 18:42:16 -0000 On Mon, 2012-05-21 at 17:08 -0700, John Baldwin wrote: > On 5/21/12 5:18 PM, John Baldwin wrote: > > On Monday, May 21, 2012 3:58:40 pm Sean Bruno wrote: > >> Author: sbruno > >> Date: Mon May 21 19:58:40 2012 > >> New Revision: 235738 > >> URL: http://svn.freebsd.org/changeset/base/235738 > >> > >> Log: > >> MFC r235634 > >> > >> Fix and update battery status bits according to linux driver > > > > Hmm, svn seems to have crapped itself. > > > > We should probably at least remove the unnecessary mergeinfo from files. > > > > Ah, it looks like the MFC of the last round of ixgbe changes was merged into a > > sparse checkout, and that is causing the pain. I will try to fix this, but > > can other folks hold off on merging to stable/9/sys while I do so? > > I think I have this cleaned up. However, I have only tried using a 1.6 > client so far (and it was merging things fine before). Sean, I think > you are using a 1.7 client, yes? > Correct: [sbruno@ref9-xen64 /dumpster/scratch/sbruno-scratch/9]$ svn --version svn, version 1.7.2 (r1207936) compiled Dec 10 2011, 23:46:28 Copyright (C) 2011 The Apache Software Foundation. This software consists of contributions made by many people; see the NOTICE file for more information. Subversion is open source software, see http://subversion.apache.org/ The following repository access (RA) modules are available: * ra_neon : Module for accessing a repository via WebDAV protocol using Neon. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme > If anyone does a merge and notices that it adds a ton of new mergeinfo, > can you please wait to commit until after someone else has looked at it? > Hopefully the mergeinfo stuff I adjusted will fix this. (And I'm > done with my current guesses at fixing.) > Sean