problem merging deleted file
mpm at selenic.com
Thu Sep 15 12:11:49 CDT 2005
On Thu, Sep 15, 2005 at 11:28:21AM -0500, Hollis Blanchard wrote:
> Hi, I'm working with this repository:
> I pull from http://xenbits.xensource.com/xen-unstable.hg (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.
> Any help? Thanks!
Please send the output of hg update -m --debug.
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial