# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1188235264 10800
# Node ID 8050f13772f64a5bff44d6be87b246b7b6c0854e
# Parent  466323968b232df2e806ebb0aeef4f2e37948a4c
Fix theoretical issue in filecommit.

If the file was copied, we don't want to reuse the original entry.

I think this is mostly a theoretical issue - when there are copies,
fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would
think the file was unmodified.  In any case, if there was a copy,
we should forcefully create a new entry.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -626,7 +626,7 @@ class localrepository(repo.repository):
                 fp2 = nullid
 
         # is the file unmodified from the parent? report existing entry
-        if fp2 == nullid and not fl.cmp(fp1, t):
+        if fp2 == nullid and not fl.cmp(fp1, t) and not meta:
             return fp1
 
         changelist.append(fn)