/hg/icedtea6: 6 new changesets

[Dr Andrew John Hughes]

On 14:34 Thu 29 Jul     , Omair Majid wrote:
> On 07/29/2010 02:08 PM, Dr Andrew John Hughes wrote:
> > On 19:51 Thu 29 Jul     , Mark Wielaard wrote:
> >> 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
> >>
> >
> > 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?).
> 

I haven't checked that.  My hg view segfaults, due to tcl not liking gcc 4.5:

$ hg view
*** buffer overflow detected ***: wish terminated

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

Yeah, typo.  hg in is useful too though! :-)

> >
> > 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.
> 
> Cheers,
> Omair

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8