Xen devel - Aug 2010 - Problems checking out stable-2.6.32.16

I am following the XenParaVirtOps wiki page instructions to check out
the stable-2.6.32.16 source tree, but am running into a problem with
switching branches, as shown below.  Can someone tell me what is now the
correct procedure?

 

Thanks,

Phil

 

 

[root@HanlonCreek01 xen-unstable.hg]# git clone
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
linux-2.6-xen

Initialized empty Git repository in
/root/xen-unstable.hg/linux-2.6-xen/.git/

remote: Counting objects: 1725601, done.

remote: Compressing objects: 100% (291152/291152), done.

Receiving objects: 100% (1725601/1725601), 387.15 MiB | 1.79 MiB/s,
done.

remote: Total 1725601 (delta 1438156), reused 1705221 (delta 1419392)

Resolving deltas: 100% (1438156/1438156), done.

You have new mail in /var/spool/mail/root

 

[root@HanlonCreek01 xen-unstable.hg]# cd linux-2.6-xen

 

[root@HanlonCreek01 linux-2.6-xen]# git reset --hard

HEAD is now at b29254c Merge branch ''xen/dom0/gntdev'' into
xen/stable-2.6.31.x

 

[root@HanlonCreek01 linux-2.6-xen]# git checkout -b xen/stable-2.6.32.16
origin/xen/stable-2.6.32.16

fatal: git checkout: updating paths is incompatible with switching
branches.

Did you intend to checkout ''origin/xen/stable-2.6.32.16'' which
can not
be resolved as commit?



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

On Wednesday 11 August 2010 20:32:37 Phil Winterfield (winterfi)
wrote:
> I am following the XenParaVirtOps wiki page instructions to check out
> the stable-2.6.32.16 source tree, but am running into a problem with
> switching branches, as shown below.  Can someone tell me what is now the
> correct procedure?
> 
> 
> 
> Thanks,
> 
> Phil
> 
> 
> 
> 
> 
> [root@HanlonCreek01 xen-unstable.hg]# git clone
> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
> linux-2.6-xen
> 
> Initialized empty Git repository in
> /root/xen-unstable.hg/linux-2.6-xen/.git/
> 
> remote: Counting objects: 1725601, done.
> 
> remote: Compressing objects: 100% (291152/291152), done.
> 
> Receiving objects: 100% (1725601/1725601), 387.15 MiB | 1.79 MiB/s,
> done.
> 
> remote: Total 1725601 (delta 1438156), reused 1705221 (delta 1419392)
> 
> Resolving deltas: 100% (1438156/1438156), done.
> 
> You have new mail in /var/spool/mail/root
> 
> 
> 
> [root@HanlonCreek01 xen-unstable.hg]# cd linux-2.6-xen
> 
> 
> 
> [root@HanlonCreek01 linux-2.6-xen]# git reset --hard
> 
> HEAD is now at b29254c Merge branch ''xen/dom0/gntdev''
into
> xen/stable-2.6.31.x
> 
> 
> 
> [root@HanlonCreek01 linux-2.6-xen]# git checkout -b xen/stable-2.6.32.16
> origin/xen/stable-2.6.32.16
should be: git checkout -b xen/stable-2.6.32.x origin/xen/stable-2.6.32.x

--
Łukasz Oleś

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

What happens if 
# git checkout -b
xen/stable-2.6.32.x origin/xen/stable-2.6.32.x

?

--- On Wed, 8/11/10, Phil Winterfield (winterfi) <winterfi@cisco.com>
wrote:

From: Phil Winterfield (winterfi) <winterfi@cisco.com>
Subject: [Xen-devel] Problems checking out stable-2.6.32.16
To: xen-devel@lists.xensource.com
Cc: "Jeremy Fitzhardinge" <jeremy@goop.org>
Date: Wednesday, August 11, 2010, 2:32 PM




 
 






I am following the XenParaVirtOps wiki page instructions to check
out the stable-2.6.32.16 source tree, but am running into a problem with
switching branches, as shown below.  Can someone tell me what is now the
correct procedure? 

   

Thanks, 

Phil 

   

   

[root@HanlonCreek01 xen-unstable.hg]# git clone
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git linux-2.6-xen 

Initialized empty Git repository in
/root/xen-unstable.hg/linux-2.6-xen/.git/ 

remote: Counting objects: 1725601, done. 

remote: Compressing objects: 100% (291152/291152), done. 

Receiving objects: 100% (1725601/1725601), 387.15 MiB | 1.79
MiB/s, done. 

remote: Total 1725601 (delta 1438156), reused 1705221 (delta
1419392) 

Resolving deltas: 100% (1438156/1438156), done. 

You have new mail in /var/spool/mail/root 

   

[root@HanlonCreek01 xen-unstable.hg]# cd linux-2.6-xen 

   

[root@HanlonCreek01 linux-2.6-xen]# git reset --hard 

HEAD is now at b29254c Merge branch ''xen/dom0/gntdev'' into
xen/stable-2.6.31.x 

   

[root@HanlonCreek01 linux-2.6-xen]# git checkout -b
xen/stable-2.6.32.16 origin/xen/stable-2.6.32.16 

fatal: git checkout: updating paths is incompatible with
switching branches. 

Did you intend to checkout ''origin/xen/stable-2.6.32.16''
which can not be resolved as commit? 



 

-----Inline Attachment Follows-----

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel



      

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel