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


Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660

To: Keir Fraser <Keir.Fraser@xxxxxxxxxxxx>
Subject: Re: [Xen-devel] [PATCH] Compile issue with tools/libfsimage/iso9660
From: Mathieu Desnoyers <compudj@xxxxxxxxxxxxxxxxxx>
Date: Mon, 5 Mar 2007 01:18:20 -0500
Cc: xen-devel@xxxxxxxxxxxxxxxxxxx
Delivery-date: Sun, 04 Mar 2007 22:17:33 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
In-reply-to: <C210F757.33D5%Keir.Fraser@xxxxxxxxxxxx>
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/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20070304210447.GB13198@Krystal> <C210F757.33D5%Keir.Fraser@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.13 (2006-08-11)
* Keir Fraser (Keir.Fraser@xxxxxxxxxxxx) wrote:
> On 4/3/07 21:04, "Mathieu Desnoyers" <compudj@xxxxxxxxxxxxxxxxxx> wrote:
> > compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg pull
> > pulling from http://xenbits.xensource.com/xen-unstable.hg
> > searching for changes
> > no changes found
> > 
> > Maybe something went wrong with the merge and I missed it ?
> The existing changeset that fixes this issue is 14038:335a8280ab1d9a87.
> Perhaps you have pulled the latest changesets into your local repository but
> not updated you locally-checked-out copy? How do 'hg heads' and 'hg parents'
> match up for you?
>  -- Keir

The issue seems solved :

compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg merge 14206
merging tools/libfsimage/iso9660/fsys_iso9660.c
merging xen/common/sysctl.c
merging xen/include/asm-x86/config.h
345 files updated, 3 files merged, 1 files removed, 0 files unresolved



Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

Xen-devel mailing list