How to handle a merge problem

[John Coomes]

David Holmes (david.holmes at oracle.com) wrote:
> On 31/01/2012 2:50 PM, Pete Brunet wrote:
> ...
> > 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
> 
> Might be easiest depending on how many files are in conflict.

If you have committed changes and want to sync with the upstream repo,
the easiest way is to use the rebase extension (works best in hg 1.6
and later).  You have to enable rebase in your .hgrc file, then you
can run

	hg pull --rebase

It will invoke your merge tool to resolve conflicts if necessary, and
move your changesets to tip.

Given that you've already pulled, you can still rebase your changesets
so they are at tip, but you have to identify them and provide them on
the command line.  See 'hg help rebase.'

-John

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