diff disagrees with status
j w
jwdevel at gmail.com
Fri Jan 25 00:12:07 UTC 2008
On Jan 24, 2008 10:39 AM, Matt Mackall <mpm at selenic.com> wrote:
>
> On Thu, 2008-01-24 at 10:09 -0800, j w wrote:
> > On Jan 24, 2008 9:49 AM, Matt Mackall <mpm at selenic.com> wrote:
> > >
> > > What you're probably seeing here is files with the same contents but
> > > different histories. You should probably compare the manifests:
> > >
> > > hg manifest --debug -r errors-warnings | grep prefs
> > > hg manifest --debug -r default | grep prefs
> > >
> >
> > Indeed, I get different manifests
> >
> > hg manifest --debug -r errors-warnings | grep prefs
> > d8ed4f6fb0c049b5a23687617afc0af49097e7f5 644 prefs.cpp
> > 8cd3f92f286ef5c2f2f452b15a37970b3f977c41 644 prefs.h
> >
> > hg manifest --debug -r default | grep prefs
> > 2da829474e32e1a12daf741c2fa7a26629a8bfcd 644 prefs.cpp
> > da58f67d343234a9ebd87517ef57b781692f94e7 644 prefs.h
> >
> > Is there any way to correct this?
> > Is there any sane way this could have happened?
>
> Yes. Typically it happens when a change gets reverted. I could spend an
> hour writing about the various design trade-offs here, but the summary
> is: it's mostly harmless.
>
Is there any wiki page or other email thread that discusses the issue
in detail? I'd be curious...
-John
More information about the Mercurial
mailing list