# HG changeset patch
# User Alejandro Santos <alejolp@alejolp.com>
# Date 1246784461 -7200
# Node ID 3f56055ff1d7b6fd2cb041c40d2576146378adfb
# Parent  0001e49f1c11a1cdc05bc5d0a23624e975134485
compat: can't compare two values of unequal datatypes

diff -r 0001e49f1c11 -r 3f56055ff1d7 mercurial/copies.py
--- a/mercurial/copies.py	Sun Jul 05 11:00:44 2009 +0200
+++ b/mercurial/copies.py	Sun Jul 05 11:01:01 2009 +0200
@@ -42,7 +42,7 @@
         seen.add(s)
         if fc.path() != orig and fc.path() not in old:
             old[fc.path()] = (depth, fc.path()) # remember depth
-        if fc.rev() < limit and fc.rev() is not None:
+        if fc.rev() is not None and fc.rev() < limit:
             continue
         visit += [(p, depth - 1) for p in fc.parents()]
 
diff -r 0001e49f1c11 -r 3f56055ff1d7 mercurial/merge.py
--- a/mercurial/merge.py	Sun Jul 05 11:00:44 2009 +0200
+++ b/mercurial/merge.py	Sun Jul 05 11:01:01 2009 +0200
@@ -288,7 +288,7 @@
                 continue
             f2, fd, flags, move = a[2:]
             r = ms.resolve(fd, wctx, mctx)
-            if r > 0:
+            if r is not None and r > 0:
                 unresolved += 1
             else:
                 if r is None: