| To: | xen-devel@xxxxxxxxxxxxxxxxxxx |
|---|---|
| Subject: | [Xen-devel] Handling of subarch rename |
| From: | "Jacob Gorm Hansen" <jacobg@xxxxxxx> |
| Date: | Mon, 8 May 2006 16:56:45 +0200 |
| Delivery-date: | 2006年5月08日 07:57:06 -0700 |
| Domainkey-signature: | a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:sender:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition:x-google-sender-auth; b=sRfkJSKL8YnaGBuBU5u54HiBKNF0pqC0YszCEPHWo4kg1XffaTuNMBwZEbMS5i7e+l07ZXLCBoNWJCEdtP5NX/lN1MFiIwLn5hgxzm0oCLzpTC5lIy4SxV9EolCYpfH6bGjgFGZOjYZoPoHbz7EB1ZP9N/2eogjddgudPk+hoSU= |
| Envelope-to: | www-data@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 |
hi, when trying to merge some old xen-3.0 code to xen-3.0.2, I bumped into the large linux 'subarch' rename which mercurial cannot merge on its own. Does anyone have an automated way of merging around this, other than the giant edit-patch-apply-hg-revert cycle? thanks, Jacob _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [Xen-devel] [PATCH] initialize some more cpuinfo fields , Keir Fraser |
|---|---|
| Next by Date: | Re: [Xen-devel] [PATCH] initialize some more cpuinfo fields , Keir Fraser |
| Previous by Thread: | Re: [Xen-devel] [PATCH][RFC] PNP Frontend/Backend: Legacy Devices in Driver Domains , Keir Fraser |
| Next by Thread: | [Xen-devel] hardware support , Ky Srinivasan |
| Indexes: | [Date] [Thread] [Top] [All Lists] |