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

On Thu, Oct 26, 2006 at 11:36:50AM +0100, Xen staging patchbot-unstable wrote:
> # HG changeset patch
> # User awilliam@xenbuild.aw
> # 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@lists.xensource.com
http://lists.xensource.com/xen-devel

On 26/10/06 11:52, "Muli Ben-Yehuda" <muli@il.ibm.com> wrote:
> 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.
I always manually diff the trees when merging from external repos.

 -- Keir



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