Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/commands.py @ 3383:5e6c19919741

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log --copies: use manifest.find instead of delta when manifest parent is not rev-1 This fixes issue391.
author Brendan Cully <brendan@kublai.com>
date Fri, 13 Oct 2006 09:58:55 -0700
parents e4aa22eaa0e4
children 55476ce8e59c
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1840,6 +1840,8 @@ def log(ui, repo, *pats, **opts):
                     break
         if rev in rcache[fn]:
             return rcache[fn][rev]
+        if repo.manifest.parentrevs(rev) != (rev - 1, -1):
+            return ncache[fn].get(repo.manifest.find(man, fn)[0])
         if not dcache or dcache[0] != man:
             dcache[:] = [man, repo.manifest.readdelta(man)]
         if fn in dcache[1]: