[pnfs] git error with latest tree

[Halevy, Benny]

I think it's trying to tell you that the reported file
is "dirty" i.e. changed comparing to the version its
supposed to be.  Try running git-diff to see what changed.
Anyhow you can either force the checkout (with git checkout -f)
or run git reset --hard first.

Benny


-----Original Message-----
From: pnfs-bounces at linux-nfs.org on behalf of Rick McNeal
Sent: Fri 2008-06-06 17:13
To: pnfs mailing list
Subject: [pnfs] git error with latest tree
 
Last night I pulled over a new pNFS tree with the following:
$ git clone git://git.linux-nfs.org/projects/bhalevy/linux-pnfs.git

This morning I attempted to checkout the latest block layout driver  
and received ...
$ git checkout -b pnfs-block origin/pnfs-block
fatal: Entry 'net/ipv4/netfilter/ipt_ECN.c' not uptodate. Cannot merge.

Does anyone know what git is trying to tell me?
----
Rick McNeal
rick.mcneal at lsi.com

A veteran is someone who, at one point in his life, wrote a blank  
check made payable to "The United States of America", for an amount of  
"up to and including my life." That is honor, and there are way too  
many people in this country who no longer understand it.
Author unknown.

_______________________________________________
pNFS mailing list
pNFS at linux-nfs.org
http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs