Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 2898 db397c38005d
parent 2897 dd032b0f02ac
child 2899 8743188f4d2e 
--- a/mercurial/merge.py	Tue Aug 15 18:30:21 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 15 22:46:35 2006 -0500
@@ -282,7 +282,8 @@
                 # of that file some time in the past. Thus our
                 # merge will appear as a normal local file
                 # modification.
-                f_len = len(repo.file(f).read(other))
+                fl = repo.file(f)
+                f_len = fl.size(fl.rev(other))
                 repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
 
     remove.sort()
Mercurial