From: Hollis Blanchard <hollisb@us.ibm.com>
To: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel <xen-devel@lists.xensource.com>,
xen-ppc-devel <xen-ppc-devel@lists.xensource.com>
Subject: please pull xenppc-unstable-merge.hg
Date: Wed, 21 Mar 2007 18:48:44 -0500 [thread overview]
Message-ID: <1174520924.32715.58.camel@basalt> (raw)
Hi Keir, please pull from
http://xenbits.xensource.com/ext/xenppc-unstable-merge.hg
I finally have beaten the domain builder into shape, which required a
moving some x86 and ia64 code around. I've also fixed a few other build
and runtime bugs that came down from recent xen-unstable changes.
Separate topic:
At this point, all PowerPC code is merged up. Because I was importing
changesets from xenppc-unstable into xenppc-unstable-merge by hand,
there's a bunch of old history left in xenppc-unstable. I would like to
merge that in. The following commands executed in xen-unstable should do
the right thing:
hg tip
hg pull http://xenbits.xensource.com/ext/xenppc-unstable.hg
HGMERGE=/bin/true hg -y merge
hg revert -a <old tip>
hg commit
It looks like that will bring in about 775 changesets without changing
any code, but that's the amount of work you would have gotten all along;
it's just coming in all at once (flooding xen-changelog). Also, not all
of them have proper DCO lines. What do you think?
(In general, I will say that manually importing selected changesets from
a "development" tree into a "merge" tree was a bad idea, and I would be
happy to elaborate for anybody who is considering this model.)
--
Hollis Blanchard
IBM Linux Technology Center
next reply other threads:[~2007-03-21 23:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-21 23:48 Hollis Blanchard [this message]
2007-03-22 0:12 ` please pull xenppc-unstable-merge.hg Keir Fraser
-- strict thread matches above, loose matches on Subject: below --
2007-03-02 23:52 Hollis Blanchard
2007-03-05 19:24 ` Hollis Blanchard
2007-03-06 10:21 ` Keir Fraser
2007-02-09 20:58 Hollis Blanchard
2007-02-14 16:44 ` Hollis Blanchard
2007-02-14 18:55 ` Keir Fraser
2007-02-14 20:53 ` Hollis Blanchard
2006-08-14 22:17 Hollis Blanchard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1174520924.32715.58.camel@basalt \
--to=hollisb@us.ibm.com \
--cc=Keir.Fraser@cl.cam.ac.uk \
--cc=xen-devel@lists.xensource.com \
--cc=xen-ppc-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.