Mercurial > hg > mercurial-crew-with-dirclash
changeset 5243:8050f13772f6
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.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 27 Aug 2007 14:21:04 -0300 |
| parents | 466323968b23 |
| children | dee573ba79f1 |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)