problem merging deleted file

Hollis Blanchard hollisb at
Thu Sep 15 12:25:45 CDT 2005

On Thursday 15 September 2005 12:11, Matt Mackall wrote:
> On Thu, Sep 15, 2005 at 11:28:21AM -0500, Hollis Blanchard wrote:
> > Hi, I'm working with this repository:
> >
> >
> > I pull from (which is my
> > upstream) and then hg update -m. I get this message:
> > 	 local changed xen/arch/ia64/xenasm.S which remote deleted
> > 	(k)eep or (d)elete?
> >
> > This is odd because I haven't modified xen/arch/ia64/xenasm.S, and hg log
> > and hg status confirm that.
> Please send the output of hg update -m --debug.

resolving manifests
 force None allow 1 moddirstate True linear False
 ancestor 014d47e807e4 local aafbc3f2dd1b remote f95061245254
 remote xen/include/asm-ia64/linux/asm/thread_info.h is newer, get
 remote xen/acm/acm_simple_type_enforcement_hooks.c is newer, get
 tools/python/xen/xend/ versions differ, resolve
 remote tools/vtpm/vtpm.patch is newer, get
other deleted xen/arch/ia64/vcpu.c
 remote tools/vnet/Makefile is newer, get
local modified xen/include/asm-ppc/ppc64/processor.h, keeping
 remote xen/include/public/acm_ops.h is newer, get
 tools/python/xen/xend/server/ versions differ, resolve
local modified xen/arch/ppc/of_handler/leap.S, keeping
other deleted xen/arch/ia64/hpsimserial.c
 linux-2.4-xen-sparse/arch/xen/lib/Makefile versions differ, resolve
other deleted xen/arch/ia64/linux/lib/copy_page_mck.S
 linux-2.6-xen-sparse/mm/page_alloc.c versions differ, resolve
 remote xen/include/xen/perfc.h is newer, get
local modified xen/include/asm-ppc/system.h, keeping
 xen/arch/x86/apic.c versions differ, resolve
 remote tools/ioemu/target-i386-dm/Makefile is newer, get
 linux-2.6-xen-sparse/arch/xen/i386/mach-default/Makefile versions differ, 
 tools/python/xen/xend/ versions differ, resolve
 linux-2.4-xen-sparse/include/linux/sched.h versions differ, resolve
local modified xen/arch/ppc/ppc32/prom_call.c, keeping
 local changed xen/arch/ia64/xenasm.S which remote deleted
(k)eep or (d)elete? 

Also, I forgot to mention I'm running hg tip from this morning (version 

Hollis Blanchard
IBM Linux Technology Center

More information about the Mercurial mailing list