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

[Keir Fraser <Keir.Fraser@xxxxxxxxxxxx>]

On 26/10/06 11:52, "Muli Ben-Yehuda" <muli@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel