Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 2918:db397c38005d
merge: use file size stored in revlog index
Add size method to filelog to handle nodes with renames
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 15 Aug 2006 22:46:35 -0500 |
parents | dd032b0f02ac |
children | 8743188f4d2e |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -282,7 +282,8 @@ def update(repo, node, branchmerge=False # 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()