##// END OF EJS Templates
copies: filter out copies when target is not in destination manifest...
Martin von Zweigbergk -
r41904:58d50c69 default draft
parent child Browse files
Show More
@@ -124,10 +124,13 b' def _chain(src, dst, a, b):'
124 # file is a copy of an existing file
124 # file is a copy of an existing file
125 t[k] = v
125 t[k] = v
126
126
127 # remove criss-crossed copies
128 for k, v in list(t.items()):
127 for k, v in list(t.items()):
128 # remove criss-crossed copies
129 if k in src and v in dst:
129 if k in src and v in dst:
130 del t[k]
130 del t[k]
131 # remove copies to files that were then removed
132 elif k not in dst:
133 del t[k]
131
134
132 return t
135 return t
133
136
@@ -194,9 +194,7 b' Fork renames x to y on one side and remo'
194 |/ x y
194 |/ x y
195 o 0 add x
195 o 0 add x
196 x
196 x
197 BROKEN: x doesn't exist here
198 $ hg debugpathcopies 1 2
197 $ hg debugpathcopies 1 2
199 y -> x
200
198
201 Copies via null revision (there shouldn't be any)
199 Copies via null revision (there shouldn't be any)
202 $ newrepo
200 $ newrepo
General Comments 0
You need to be logged in to leave comments. Login now