hgext/convert/hg.py
changeset 36340 06464d1ce6cd
parent 36148 0f9e52f900c4
child 36607 c6061cadb400
equal deleted inserted replaced
36339:a4d41ba4ad23 36340:06464d1ce6cd
   561             try:
   561             try:
   562                 copysource, _copynode = ctx.filectx(name).renamed()
   562                 copysource, _copynode = ctx.filectx(name).renamed()
   563                 if copysource in self.ignored:
   563                 if copysource in self.ignored:
   564                     continue
   564                     continue
   565                 # Ignore copy sources not in parent revisions
   565                 # Ignore copy sources not in parent revisions
   566                 found = False
   566                 if not any(copysource in p for p in parents):
   567                 for p in parents:
       
   568                     if copysource in p:
       
   569                         found = True
       
   570                         break
       
   571                 if not found:
       
   572                     continue
   567                     continue
   573                 copies[name] = copysource
   568                 copies[name] = copysource
   574             except TypeError:
   569             except TypeError:
   575                 pass
   570                 pass
   576             except error.LookupError as e:
   571             except error.LookupError as e: