How to handle a merge problem

[Pete Brunet]

Hi David, It might help to know that I had pulled the code back in
September or so, made several changes, and then got diverted onto
another project for a while.  So now I'm trying to get back in sync with
the latest code.  The first thing I did was update my patch with hg
qrefresh and then from cygwin ran get_source to update the code.  So
it's quite possible I will have merge conflicts, but I don't know the
process to find and fix them in this case.  Or maybe I should start from
scratch, apply my patch and fix the issues that way.  I seem to remember
that the one time I did have a problem applying a patch to fresh clone I
was able to fix them.  -Pete

On 1/30/12 8:56 PM, David Holmes wrote:
> Pete,
>
> On 31/01/2012 12:45 PM, Pete Brunet wrote:
>> I just did the following:
>> sh ./get_source.sh
>>
>> and got this:
>> <snip>
>> # cd ./jdk&&  hg pull -u
>> pulling from http://hg.openjdk.java.net/jdk8/jdk8//jdk
>> searching for changes
>> adding changesets
>> adding manifests
>> adding file changes
>> added 563 changesets with 3123 changes to 2661 files (+1 heads)
>> not updating: crosses branches (merge branches or update --check to
>> force update)
>> # exit code 0
>
> This shouldn't be possible. get_source will first clone the repos then
> do a hg pull (why? Given it just cloned it!)
>
> It may be that you were extremely unlucky and between the clone and
> the pull there was an integration push to the repo. Even so you
> shouldn't get multiple heads. ???
>
>> How do I fix this?  I haven't found instructions on the various OpenJDK
>> sites.
>
> Delete the jdk repo and start again is all I can suggested to get back
> to a sane state.
>
> David
> -----
>
>> Pete