[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

  • To: Muli Ben-Yehuda <muli@xxxxxxxxxx>, <xen-devel@xxxxxxxxxxxxxxxxxxx>
  • From: Keir Fraser <Keir.Fraser@xxxxxxxxxxxx>
  • Date: Thu, 26 Oct 2006 11:57:50 +0100
  • Delivery-date: Thu, 26 Oct 2006 03:58:39 -0700
  • List-id: Xen developer discussion <xen-devel.lists.xensource.com>
  • Thread-index: Acb47ZP20pLzcGTgEdudzgAX8io7RQ==
  • Thread-topic: [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg

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



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.