equal
deleted
inserted
replaced
155 if not ca: # unrelated? |
155 if not ca: # unrelated? |
156 continue |
156 continue |
157 # named changed on only one side? |
157 # named changed on only one side? |
158 if ca.path() == c.path() or ca.path() == c2.path(): |
158 if ca.path() == c.path() or ca.path() == c2.path(): |
159 fullcopy[c.path()] = of # remember for dir rename detection |
159 fullcopy[c.path()] = of # remember for dir rename detection |
160 if c == ca and c2 == ca: # no merge needed, ignore copy |
160 if c == c2: # no merge needed, ignore copy |
161 continue |
161 continue |
162 copy[c.path()] = of |
162 copy[c.path()] = of |
163 |
163 |
164 if not repo.ui.configbool("merge", "followcopies", True): |
164 if not repo.ui.configbool("merge", "followcopies", True): |
165 return {} |
165 return {} |