/hg/icedtea6: 6 new changesets

[Mark Wielaard]

On Thu, 2010-07-29 at 14:34 -0400, Omair Majid wrote:
> On 07/29/2010 02:08 PM, Dr Andrew John Hughes wrote:
> > That seems right, given the circumstances.  The question is how you
> > got into a state where there was a conflict to begin with.
> >
> Hm... 'hg view' shows what might have happened. Apparently mjw had an 
> old checkout lying around (missing hg pull && hg update perhaps?).
> 
> > Note that you can check what will be pushed with 'hg in'.
> 
> Shouldnt that be 'hg out'? IIRC 'in' (or incoming) checks for the 
> changesets that would get pulled in on hg pull
> >
> > There don't seem to be any problems building anyway.
> 
> Yup, I can confirm. Even though there are tons of files listed, they 
> seem to refer to stuff that was merged. The build works just fine.

Thanks for checking. I was sure I had a recent pull/update, but
apparently not (this is not on my normal hacking machine, so it could
indeed have been a bit older copy). I was just a little confused about
the 4 other commits in the changeset, I had expected it to only contain
my commit and the merge itself.

Cheers,

Mark