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

[Mathieu Desnoyers <compudj@xxxxxxxxxxxxxxxxxx>]

* 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


Thanks,

Mathieu


-- 
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
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel