merge awkwardness
Hollis Blanchard
hollisb at us.ibm.com
Mon Aug 22 17:08:20 CDT 2005
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
-C seems to work fine, but then if I modify any branch-only file, hg diff
lists the entire local file, not just the diff. For example:
echo >> xen/arch/ppc/Rules.mk
hg diff
Am I doing something wrong? Thanks!
--
Hollis Blanchard
IBM Linux Technology Center
More information about the Mercurial
mailing list