equal
deleted
inserted
replaced
136 return False |
136 return False |
137 |
137 |
138 if not fco.cmp(fcd): # files identical? |
138 if not fco.cmp(fcd): # files identical? |
139 return None |
139 return None |
140 |
140 |
141 if fca == fco: # backwards, use working dir parent as ancestor |
|
142 fca = fcd.parents()[0] |
|
143 |
|
144 ui = repo.ui |
141 ui = repo.ui |
145 fd = fcd.path() |
142 fd = fcd.path() |
146 binary = isbin(fcd) or isbin(fco) or isbin(fca) |
143 binary = isbin(fcd) or isbin(fco) or isbin(fca) |
147 symlink = 'l' in fcd.flags() + fco.flags() |
144 symlink = 'l' in fcd.flags() + fco.flags() |
148 tool, toolpath = _picktool(repo, ui, fd, binary, symlink) |
145 tool, toolpath = _picktool(repo, ui, fd, binary, symlink) |