/hg/icedtea6: 6 new changesets

[Mark Wielaard]

On Thu, 2010-07-29 at 16:16 +0100, Dr Andrew John Hughes wrote:
> On 14:26 Thu 29 Jul     , Mark Wielaard wrote:
> > Hmmm. I did notice I needed to do a merge of my commit. But now I am
> > confused about what I ended up pushing. It looks like I pushed some of
> > Andrew's commits from last year??? Did I mess something up? If so
> > what/how? And if I did, my apologies. Please let me know if I need to
> > clean something up. (Unfortunately I am not consistently online atm, but
> > will probably be in the evening.)
> >
> What commands did you run?

As far as I remember, I did:

hg commit
hg push (failed because would create multiple heads?)
hg pull
hg update (notice merge conflict in ChangeLog file)
hg resolve -m ChangeLog
hg commit -m "Merge"
hg push

Was that the wrong sequence?

Cheers,

Mark