Serious problem (was bug: not canonilizing paths?)

Neal Becker ndbecker2 at gmail.com
Thu Aug 4 10:34:08 CDT 2005


On Thursday 04 August 2005 11:23 am, Matt Mackall wrote:
> On Thu, Aug 04, 2005 at 11:02:09AM -0400, Neal Becker wrote:
> > After adding/forgetting file and ./file, now hg is wedged.
> >
> > hg commit -m 'optfilt10+optfilt11'
> > failed to remove ./file from manifest
> > transaction abort!
> > rollback completed
> >
> > hg manifest | grep file
> > (nothing)
> >
> > What can I do?  I also tried re-adding file and/or ./file.  Still commit
> > fails.
>
> hg forget ./file should work. Take a peek at 'hg debugstate'. Did you
> commit a revision containing ./file? hg manifest <cset> will show you
> what's in a manifest.

Yes hg forget ./file seems to have fixed it.

I do notice that I have files committed both ways, which I'm guessing is going 
to cause further problems:

hg manifest:
hg manifest
df944e3287a008ddb96bccb04a61c82c5e6805fb 644 ./nonlinear/SConscript
730ffa755c0c0ce575b6857e20ddec23f88bf5a6 644 ./src/SConscript
e2c757b4a1fd5724ab3fee48b382a865440cad9c 644 ./wrap/SConscript
57bab864f8366b39c2aba496d013f5d58fa81a19 644 SConstruct
[...]

Should I be worried?  Will I be able to fix this?  Will a new hg patch address 
this?


More information about the Mercurial mailing list