equal
deleted
inserted
replaced
97 # chain was a rename, not a copy |
97 # chain was a rename, not a copy |
98 del t[v] |
98 del t[v] |
99 if v in src: |
99 if v in src: |
100 # file is a copy of an existing file |
100 # file is a copy of an existing file |
101 t[k] = v |
101 t[k] = v |
|
102 |
|
103 # remove criss-crossed copies |
|
104 for k, v in t.items(): |
|
105 if k in src and v in dst: |
|
106 print "bad", k, v |
|
107 del t[k] |
|
108 |
102 return t |
109 return t |
103 |
110 |
104 def _tracefile(fctx, actx): |
111 def _tracefile(fctx, actx): |
105 '''return file context that is the ancestor of fctx present in actx''' |
112 '''return file context that is the ancestor of fctx present in actx''' |
106 stop = actx.rev() |
113 stop = actx.rev() |