[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] Problems checking out stable-2.6.32.16


  • To: xen-devel@xxxxxxxxxxxxxxxxxxx, "Phil Winterfield \(winterfi\)" <winterfi@xxxxxxxxx>
  • From: Boris Derzhavets <bderzhavets@xxxxxxxxx>
  • Date: Wed, 11 Aug 2010 12:51:45 -0700 (PDT)
  • Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
  • Delivery-date: Wed, 11 Aug 2010 12:52:44 -0700
  • Domainkey-signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:X-YMail-OSG:Received:X-Mailer:Date:From:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type; b=ornsD9KHZnwIosOqW98/HTcniyda4d3La6UMtikOXI/PIrzOY7RgY6VbiiCsBjolC4Tuu1eKgfvxIO1V90glInb7weEy1xU5USavb4XdkOYfxVXSPPqwy+QHvCdO7JfxuLDtVzz7VPZ65GXChRuybeZ/gwpIdgMFcLZLCcy7ljg=;
  • List-id: Xen developer discussion <xen-devel.lists.xensource.com>

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@xxxxxxxxx> wrote:

From: Phil Winterfield (winterfi) <winterfi@xxxxxxxxx>
Subject: [Xen-devel] Problems checking out stable-2.6.32.16
To: xen-devel@xxxxxxxxxxxxxxxxxxx
Cc: "Jeremy Fitzhardinge" <jeremy@xxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

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

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.