equal
deleted
inserted
replaced
227 force=True, |
227 force=True, |
228 acceptremote=False, |
228 acceptremote=False, |
229 followcopies=False, |
229 followcopies=False, |
230 ) |
230 ) |
231 |
231 |
232 for file, (action, info, msg) in pycompat.iteritems(mresult.actions): |
232 for file, (action, info, msg) in mresult.filemap(): |
233 if source.targetfilebelongstosource(file): |
233 if source.targetfilebelongstosource(file): |
234 # If the file belongs to the source repo, ignore the p2 |
234 # If the file belongs to the source repo, ignore the p2 |
235 # since it will be covered by the existing fileset. |
235 # since it will be covered by the existing fileset. |
236 continue |
236 continue |
237 |
237 |