Mercurial > hg
comparison hgext/convert/subversion.py @ 9169:7a276f72a08a
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 17 Jul 2009 16:01:19 +0200 |
| parents | ef440eab290f e8441597d2ee |
| children | c5f0825c1dbb |
comparison
equal
deleted
inserted
replaced
| 9167:b67adc2daa15 | 9169:7a276f72a08a |
|---|---|
| 452 # /tags/tag.1 (from /trunk:10) | 452 # /tags/tag.1 (from /trunk:10) |
| 453 # /tags/tag.1/foo (from /branches/foo:12) | 453 # /tags/tag.1/foo (from /branches/foo:12) |
| 454 # Here/tags/tag.1 discarded as well as its children. | 454 # Here/tags/tag.1 discarded as well as its children. |
| 455 # It happens with tools like cvs2svn. Such tags cannot | 455 # It happens with tools like cvs2svn. Such tags cannot |
| 456 # be represented in mercurial. | 456 # be represented in mercurial. |
| 457 addeds = dict((p, e.copyfrom_path) for p, e | 457 addeds = dict((p, e.copyfrom_path) for p, e |
| 458 in origpaths.iteritems() if e.action == 'A') | 458 in origpaths.iteritems() |
| 459 if e.action == 'A' and e.copyfrom_path) | |
| 459 badroots = set() | 460 badroots = set() |
| 460 for destroot in addeds: | 461 for destroot in addeds: |
| 461 for source, sourcerev, dest in pendings: | 462 for source, sourcerev, dest in pendings: |
| 462 if (not dest.startswith(destroot + '/') | 463 if (not dest.startswith(destroot + '/') |
| 463 or source.startswith(addeds[destroot] + '/')): | 464 or source.startswith(addeds[destroot] + '/')): |