Re: [Xen-devel] Re: linux-2.6-xen et al

["Christian Limpach" <christian.limpach@xxxxxxxxx>]

On 6/5/06, Chris Wright <chrisw@xxxxxxxxxxxx> wrote:
> Going from xen-unstable to linux-2.6-xen is largely scripted (although
> it needs human attention).  The rest of the merging is automated to the
> degree that SCM's can help, final bit of conflict resolution being
> manual, of course.
Yes, it's pretty much automated now, all I do is sanity check the
result before it goes out.  There's a few corner cases which can cause
trouble:
- add/delete of files to the sparse tree:
 * add can be dropped iff the file is added first and only changed in
a seperate changeset
 * delete needs to restore the file to the unchanged version
- merges and long lived branches:
 Since the process linearizes the changesets, merges can usually be
dropped (unless they sneak in changes...)  This becomes a bit tricker
with long lived branches, especially when there are merges back from
xen-unstable -- we have those regularly in the xen-unstable-ia64 tree
and try to avoid them otherwise.
- 2.6.16 vs 2.6.16.13 differences:
 xen-unstable is based on 2.6.16.13 while linux-2.6-xen is based on 2.6.16

   christian

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