| changeset 4531 | b51a8138292a |
| parent 4530 | 0ac7fee4f024 |
| child 4536 | 720ae5085ee3 |
| 4530:0ac7fee4f024 | 4531:b51a8138292a |
|---|---|
691 if fpa == fp1: |
691 if fpa == fp1: |
692 fp1, fp2 = fp2, nullid |
692 fp1, fp2 = fp2, nullid |
693 elif fpa == fp2: |
693 elif fpa == fp2: |
694 fp2 = nullid |
694 fp2 = nullid |
695 |
695 |
696 # is the file unmodified from the parent? report existing entry |
696 # is the file unmodified from the parent? report existing entry |
697 if fp2 == nullid and not fl.cmp(fp1, t): |
697 if fp2 == nullid and not fl.cmp(fp1, t): |
698 return fp1 |
698 return fp1 |
699 |
699 |
700 changelist.append(fn) |
700 changelist.append(fn) |
701 return fl.add(t, meta, transaction, linkrev, fp1, fp2) |
701 return fl.add(t, meta, transaction, linkrev, fp1, fp2) |
702 |
702 |
703 def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None, extra={}): |
703 def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None, extra={}): |