merge awkwardness

[Hollis Blanchard]

On Monday 22 August 2005 18:19, Matt Mackall wrote:
> On Mon, Aug 22, 2005 at 05:08:20PM -0500, Hollis Blanchard wrote:
> > I've got a problem I don't understand, so maybe I'm just doing something
> > wrong...
> >
> > I've got a Xen branch that I'm trying to merge up to the latest Xen
> > upstream.
> >
> > 	# get branch
> > 	hg clone http://xenbits.xensource.com/ext/xenppc-unstable.hg
> > 	cd xenppc-unstable.hg
> > 	# pull in latest upstream changes
> > 	hg pull http://xenbits.xensource.com/xen-unstable.hg
> >
> > At this point I have two options, "hg update -m" or "hg update -C". -m
> > drops me into vi for a whole ton of files I haven't changed in my branch,
> > so that seems wrong. See for yourself:
> > 	hg update -m
>
> Seems you've not got any of the normal 3-way merge tools available.
> $EDITOR is the last fallback of the hgmerge script. You'll probably
> want one of merge (from RCS), tkdiff, or kdiff3 (recommended).

Actually, the vi part wasn't my question... I'm worried about needing to merge 
files that I haven't touched.

Turns out I had, somehow, and I think this is my problem. At some point I was 
forced to merge tools/Rules.mk (as an example). I had no local changes to it, 
but a changeset was generated for it anyways (see changeset 5856 at 
http://xenbits.xensource.com/ext/xenppc-unstable.hg?cmd=changelog;rev=5861). 
So now I really have local changesets to tools/Rules.mk, so all future 
upstream changes will require me to merge?

Also confusing: the changeset IDs listed at that URL do not match those listed 
by 'hg log tools/Rules.mk':
	changeset 5856:  	9315bd0d698d
	parent 5797:	47ca1724b31c
	parent 5855:	48aed1403fe3
vs
	changeset:   5856:9315bd0d698d9ca77878a38aa82928a74c9218ca
	parent:      5:f168352f92328c20bb5419fbac8fb4723e26fc9d
	parent:      6:4d2ce12aad39909ae221671c11b37bf48dfff266

-- 
Hollis Blanchard
IBM Linux Technology Center