 Home |
Products |
Support |
Community |
News |
xen-devel
Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable
| To: | Muli Ben-Yehuda <muli@xxxxxxxxxx>, <xen-devel@xxxxxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | Re: [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg |
| 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 |
| Envelope-to: | www-data@xxxxxxxxxxxxxxxxxx |
| In-reply-to: | <20061026105212.GK4868@xxxxxxxxxxxxxxxxxx> |
| 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> |
| Sender: | xen-devel-bounces@xxxxxxxxxxxxxxxxxxx |
| Thread-index: | Acb47ZP20pLzcGTgEdudzgAX8io7RQ== |
| Thread-topic: | [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg |
| User-agent: | Microsoft-Entourage/11.2.5.060620 |
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 |
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg, Muli Ben-Yehuda |
|---|---|
| Next by Date: | Re: [Xen-devel] Crash with 3.0.3 on domain creation, Jacob Gorm Hansen |
| Previous by Thread: | [Xen-devel] Re: [Xen-staging] [xen-unstable] merge with xen-unstable.hg, Muli Ben-Yehuda |
| Next by Thread: | [Xen-devel] [PATCH]mini-os: move time.c to arch/x86, Dietmar Hahn |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
