Re: [Xen-merge] massive changes

[Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>]

On Wed, Jan 11, 2006 at 06:25:40PM +0100, Jan Beulich wrote:
> >> Then how would I identify the kernel.org baseline that the merge tree uses 
> >> at a given point in time?
> >
> >Not 100% sure what you mean -- I pull from the
> >http://www.kernel.org/hg/linux-2.6 repository, I guess the baseline
> >is the latest changeset from that tree, which would be one of the
> >parents of the latest changeset with the "Merge with Linux trunk."
> >checkin message.  It should also be the latest changeset on the
> >branch from the latest Linux tag in the repository (currently v2.6.15)
> 
> The underlying problem is that in order to use the Xen changes in SLES10, we 
> need to have them in patch form. That
> means we need to have a way to generate one or more patches that collectively 
> represent exactly the changes Xen does on
> top of kernel.org. To generate such a patch it would be very helpful to have 
> precise knowledge on the underlying
> kernel.org tree; without that it would mean we'd have to compare to 
> kernel.org 2.6.15 (or some of the 2.6.15-git*
> snapshots) and then go through the resulting patch(es) and remove everything 
> that originates from kernel.org - obviously
> quite a tedious and error prone task.

You might be better off using the linux-2.6-xen.hg tree then which is based
on 2.6.15. (http://xenbits.xensource.com/linux-2.6-xen.hg)

    christian


_______________________________________________
Xen-merge mailing list
Xen-merge@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-merge