|
From: | Aaron Bentley |
Subject: | Re: [Gnu-arch-users] PANIC: conflict applying patch in arch_build_revision |
Date: | Mon, 02 Feb 2004 18:44:46 -0500 |
User-agent: | Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4 |
Jacob Gorm Hansen wrote:
$ tla get xen--migration--1.2 * from import revision: address@hidden/xen--unstable--1.2--base-0 * patching for revision: address@hidden/xen--unstable--1.2--patch-1 * patching for revision: address@hidden/xen--migration--1.2--base-0 * patching for revision: address@hidden/xen--migration--1.2--patch-1 PANIC: conflict applying patch in arch_build_revision
Okay, try this: tla get address@hidden/xen--migration--1.2--base-0 basetla get-changeset address@hidden/xen--migration--1.2--patch-1 patch
tla apply-changeset patch base That should at least show you where the conflicts lie. Aaron
[Prev in Thread] | Current Thread | [Next in Thread] |