this works for me now. thank you.

Please retest this and mark it resolved if it works.

I just killed the whole function.

matt, please apply.

i talked to chris. he says the patch i have attached is best.

This happens with every change you submit?

Could you please attach the output from hg manifest

I might need a tar of the repo to debug it, would that be possible?

If you know what changeset is causing the problem, please do:

hg log --debug -r <changeset> # get first manifest rev, 1419 here 
...
manifest:    1419:e2e597083e6ccaa0ea382950418eaafce6cb7075
...          

hg debugdata .hg/00manifest.d 1418 > before
hg debugdata .hg/00manifest.d 1419 > after

and attach them here.

yes i can reproduce it 100%.

Eep! Is this reproduceable? The message should instead say "sortdiff failed!
report it immediately!"

i have found a bug in manifest.diff. this happens when i try to commit a change
in my repository. it raises an AssertionError that says sortdiff failed. i think
the manifest cache code is getting confused. i do not know why.

this patch fixes the problem for me.

diff -r 68f81ba07b2a mercurial/manifest.py
--- a/mercurial/manifest.py	Thu Oct 20 11:41:14 2005 -0700
+++ b/mercurial/manifest.py	Thu Oct 20 22:14:54 2005 -0700
@@ -43,11 +43,9 @@
         # this is sneaky, as we're not actually using a and b
         if self.listcache and self.addlist and self.listcache[0] == a:
             d = mdiff.diff(self.listcache[1], self.addlist, 1)
-            if mdiff.patch(a, d) != b:
-                raise AssertionError(_("sortdiff failed!"))
-            return d
-        else:
-            return mdiff.textdiff(a, b)
+            if mdiff.patch(a, d) == b:
+                return d
+        return mdiff.textdiff(a, b)
 
     def add(self, map, flags, transaction, link, p1=None, p2=None,
             changed=None):