changeset 4531 | b51a8138292a |
parent 4530 | 0ac7fee4f024 |
child 4535 | 720ae5085ee3 |
--- a/mercurial/localrepo.py Sat Jun 09 01:04:28 2007 -0300 +++ b/mercurial/localrepo.py Sat Jun 09 01:04:28 2007 -0300 @@ -693,9 +693,9 @@ elif fpa == fp2: fp2 = nullid - # is the file unmodified from the parent? report existing entry - if fp2 == nullid and not fl.cmp(fp1, t): - return fp1 + # is the file unmodified from the parent? report existing entry + if fp2 == nullid and not fl.cmp(fp1, t): + return fp1 changelist.append(fn) return fl.add(t, meta, transaction, linkrev, fp1, fp2)