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?

I have :

compudj@dijkstra:~/xen/xen-unstable-lttng.hg$ hg heads
changeset:   14209:d62b52c15b53
tag:         tip
user:        compudj@xxxxxxxxxxxxxxxxxxxxxxxx
date:        Sat Mar 03 03:04:05 2007 -0500
summary:     ltt-tracer.c compiles ok.

changeset:   14206:3ac19fda0bc2
user:        kfraser@xxxxxxxxxxxxxxxxxxxxx
date:        Fri Mar 02 12:11:52 2007 +0000
summary:     linux: Support new 'fast suspend' mode which does not
require us to

dijkstra:~/xen/xen-unstable-lttng.hg$ hg parents
changeset:   14209:d62b52c15b53
tag:         tip
user:        compudj@xxxxxxxxxxxxxxxxxxxxxxxx
date:        Sat Mar 03 03:04:05 2007 -0500
summary:     ltt-tracer.c compiles ok.

I guess I should merge 14206:3ac19fda0bc2 into tip ?


-- 
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