xen-devel

[Top] [All Lists]

[Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg

from [Muli Ben-Yehuda]

[Permanent Link][Original]

To:	xen-devel@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg
From:	Muli Ben-Yehuda <muli@xxxxxxxxxx>
Date:	Thu, 26 Oct 2006 12:52:12 +0200
Delivery-date:	Thu, 26 Oct 2006 03:52:41 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
In-reply-to:	<200610261036.k9QAavsw029855@xxxxxxxxxxxxxxxxxxxxxxx>
List-help:	<mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id:	Xen developer discussion <xen-devel.lists.xensource.com>
List-post:	<mailto:xen-devel@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References:	<200610261036.k9QAavsw029855@xxxxxxxxxxxxxxxxxxxxxxx>
Sender:	xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent:	Mutt/1.5.11

On Thu, Oct 26, 2006 at 11:36:50AM +0100, Xen staging patchbot-unstable wrote:

> # HG changeset patch
> # User awilliam@xxxxxxxxxxx
> # Date 1159319493 21600
> # Node ID f34e37d0742d80ccfefd017a91f93310ebc2dfe8
> # Parent  9da2d9b48ff8711516a07f7a06120abedb4e24b2
> # Parent  bd811e94d293ebcb8fb15db0becacd36c65a4ac7
> merge with xen-unstable.hg

These huge merges are a little worrying - how are you verifying that
they don't accidentally revert stuff?

The kernel developers have strict rules about merges - basically
create trees that don't have any in them when you're ready for them to
be pulled upstream. This is probably easier in git then in hg, but
worth considering.

Cheers,
Muli

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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg, Muli Ben-Yehuda <= Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg, Keir Fraser

Previous by Date:	Re: [Xen-devel] 32bit HVM PV drivers on 64bit hypervisor, Keir Fraser
Next by Date:	Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg, Keir Fraser
Previous by Thread:	[Xen-devel] 32bit HVM PV drivers on 64bit hypervisor, He, Qing
Next by Thread:	Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg, Keir Fraser
Indexes:	[Date] [Thread] [Top] [All Lists]