equal
deleted
inserted
replaced
708 # /tags/tag.1 (from /trunk:10) |
708 # /tags/tag.1 (from /trunk:10) |
709 # /tags/tag.1/foo (from /branches/foo:12) |
709 # /tags/tag.1/foo (from /branches/foo:12) |
710 # Here/tags/tag.1 discarded as well as its children. |
710 # Here/tags/tag.1 discarded as well as its children. |
711 # It happens with tools like cvs2svn. Such tags cannot |
711 # It happens with tools like cvs2svn. Such tags cannot |
712 # be represented in mercurial. |
712 # be represented in mercurial. |
713 addeds = dict( |
713 addeds = { |
714 (p, e.copyfrom_path) |
714 p: e.copyfrom_path |
715 for p, e in pycompat.iteritems(origpaths) |
715 for p, e in pycompat.iteritems(origpaths) |
716 if e.action == b'A' and e.copyfrom_path |
716 if e.action == b'A' and e.copyfrom_path |
717 ) |
717 } |
718 badroots = set() |
718 badroots = set() |
719 for destroot in addeds: |
719 for destroot in addeds: |
720 for source, sourcerev, dest in pendings: |
720 for source, sourcerev, dest in pendings: |
721 if not dest.startswith( |
721 if not dest.startswith( |
722 destroot + b'/' |
722 destroot + b'/' |