--- a/mercurial/merge.py Sun Oct 15 21:09:56 2006 +0200
+++ b/mercurial/merge.py Sun Oct 15 16:18:09 2006 -0500
@@ -30,7 +30,7 @@
fco = mctx.filectx(fo)
if not fco.cmp(fcm.data()): # files identical?
- return 0
+ return None
fca = fcm.ancestor(fco)
if not fca:
@@ -288,10 +288,14 @@
removed +=1
elif m == "m": # merge
f2, fd, flag, move = a[2:]
- if filemerge(repo, f, f2, wctx, mctx):
+ r = filemerge(repo, f, f2, wctx, mctx)
+ if r > 0:
unresolved += 1
else:
- merged += 1
+ if r is None:
+ updated += 1
+ else:
+ merged += 1
if f != fd:
repo.ui.debug(_("copying %s to %s\n") % (f, fd))
repo.wwrite(fd, repo.wread(f))