equal
deleted
inserted
replaced
624 fp1, fp2 = fp2, nullid |
624 fp1, fp2 = fp2, nullid |
625 elif fpa == fp2: |
625 elif fpa == fp2: |
626 fp2 = nullid |
626 fp2 = nullid |
627 |
627 |
628 # is the file unmodified from the parent? report existing entry |
628 # is the file unmodified from the parent? report existing entry |
629 if fp2 == nullid and not fl.cmp(fp1, t): |
629 if fp2 == nullid and not fl.cmp(fp1, t) and not meta: |
630 return fp1 |
630 return fp1 |
631 |
631 |
632 changelist.append(fn) |
632 changelist.append(fn) |
633 return fl.add(t, meta, transaction, linkrev, fp1, fp2) |
633 return fl.add(t, meta, transaction, linkrev, fp1, fp2) |
634 |
634 |