# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2005-08-10 06:51:37
# Node ID a7e95e3606c7fc4758922d961f8465117ada2098
# Parent  d70c1c31fd458a6bcff03175b03b2a553930ce20

Use length of file instead of length of change for the dirstate entry.


diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1584,7 +1584,7 @@ class localrepository:
                     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"