Mercurial > hg
comparison mercurial/localrepo.py @ 3293:4546a5e31cb8
Use filelog.cmp in checkfilemerge
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 20:18:59 -0500 |
parents | 764688cf51e5 |
children | a2d93b186a0e a1aad25ccc3e |
comparison
equal
deleted
inserted
replaced
3292:764688cf51e5 | 3293:4546a5e31cb8 |
---|---|
495 fp1, fp2 = fp2, nullid | 495 fp1, fp2 = fp2, nullid |
496 elif fpa == fp2: | 496 elif fpa == fp2: |
497 fp2 = nullid | 497 fp2 = nullid |
498 | 498 |
499 # is the file unmodified from the parent? report existing entry | 499 # is the file unmodified from the parent? report existing entry |
500 # fixme: use filelog.cmp() | 500 if fp2 == nullid and not filelog.cmp(fp1, text): |
501 if fp2 == nullid and text == filelog.read(fp1): | |
502 return (fp1, None, None, {}) | 501 return (fp1, None, None, {}) |
503 | 502 |
504 return (None, fp1, fp2, meta) | 503 return (None, fp1, fp2, meta) |
505 | 504 |
506 def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None): | 505 def rawcommit(self, files, text, user, date, p1=None, p2=None, wlock=None): |