This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


[Xen-devel] Problems checking out stable-

To: <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] Problems checking out stable-
From: "Phil Winterfield (winterfi)" <winterfi@xxxxxxxxx>
Date: Wed, 11 Aug 2010 11:32:37 -0700
Authentication-results: sj-iport-5.cisco.com; dkim=neutral (message not signed) header.i=none
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Delivery-date: Wed, 11 Aug 2010 11:33:42 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
Importance: low
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Priority: Non-Urgent
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thread-index: Acs5g5Kir/KbnL3ITV63YULqr+dL1w==
Thread-topic: Problems checking out stable-

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






[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- origin/xen/stable-

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

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

Xen-devel mailing list
<Prev in Thread] Current Thread [Next in Thread>