svn commit: r235738 - in stable/9/sys: . dev/mfi

[Sean Bruno]

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 at 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