Re: [Xen-devel] [PATCH] xen/x86: Add support for cpuid masking on Intel Xeon Processor E5 Family

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2012-08-08 at 09:48 +0100, Jan Beulich wrote:
> >>> On 08.08.12 at 10:02, Ian Campbell <Ian.Campbell@xxxxxxxxxx> wrote:
> > On Wed, 2012-08-08 at 08:08 +0100, Jan Beulich wrote:
> >> >>> On 07.08.12 at 19:47, Matt Wilson <msw@xxxxxxxxxx> wrote:
> >> > For what it's worth, I think that the first line of the commit log got
> >> > dropped, which makes for a strange short log message of:
> >> > 
> >> >   Although the "Intel Virtualization Technology FlexMigration
> >> 
> >> Yes, I'm sorry for that, but I realized this only after pushing, and
> >> I'm unaware of ways to adjust the commit message of an existing
> >> c/s.
> > 
> > There is an hg rebase extension something like git's rebase -i but I
> > find the easiest way is to use the mq extension's function which pulls
> > the tip commit into a patch in the queue.
> > 
> > Actually, that's not quite true, I find the real easiest way is to hg
> > strip the wrong commit and try again.
> 
> But that's only if it didn't get pushed yet?

Yes, it's only if you catch the mistake before pushing. If you've pushed
then in principal you could hg strip on the server but in practice you
don't want to do that on a widely used/shared repo and you just have to
live with the mistake, or I suppose you could hg revert and recommit if
the bad cset was really confusing etc.

> > Actually, that's not true either, the real easiest way IMHO is to use a
> > git mirror for all the leg work and Ian J's git2hgapply script to
> > actually "apply" it. YMMV depending on your feelings about git
> > though ;-)
> 
> Indeed. While I'm slowly getting to know it better, I'm still not
> really friends with it.

I'm not sure any one is ;-)

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel