Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use length of file instead of length of change for the dirstate entry.
authorThomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 07:51:37 +0100
changeset 863 a7e95e3606c7
parent 862 d70c1c31fd45
child 864 6225bd773c51
Use length of file instead of length of change for the dirstate entry.
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py	Wed Aug 10 06:47:46 2005 +0100
+++ b/mercurial/hg.py	Wed Aug 10 07:51:37 2005 +0100
@@ -1584,7 +1584,7 @@
                     m1n = self.changelog.read(p1)[0]
                     m1 = self.manifest.read(m1n)
                     file_ = self.file(f)
-                    f_len = file_.length(file_.rev(m1[f]))
+                    f_len = len(file_.read(m1[f]))
                     self.dirstate.update([f], mode, st_size=f_len, st_mtime=0)
                 else:
                     self.ui.warn("Second parent without branch merge!?\n"
hg-stable