problem merging deleted file
mpm at selenic.com
Thu Sep 15 13:35:02 CDT 2005
On Thu, Sep 15, 2005 at 12:25:45PM -0500, Hollis Blanchard wrote:
> 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:
> > > http://xenbits.xensource.com/ext/xenppc-unstable.hg
> > >
> > > 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.
> > 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
Ok, now use this to figure out what file revisions are actually being
hg manifest 014d47e807e4 | grep xenasm.S # ancestor
hg manifest aafbc3f2dd1b | grep xenasm.S # local
hg manifest f95061245254 | grep xenasm.S # remote
I suspect we'll see local different from ancestor and no entry for remote.
You should probably also send the output of:
hg debugindex .hg/data/xen/arch/ia64/xenasm.S.i
Then we can figure out when hg thinks this file changed in your local branch.
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial