Mercurial > hg
comparison hgext/convert/subversion.py @ 8247:8846ebb844ac
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 29 Apr 2009 21:48:15 +0200 |
| parents | f35b933044cc 965b11c1bd82 |
| children | d093e57671ea |
comparison
equal
deleted
inserted
replaced
| 8245:0eade101f762 | 8247:8846ebb844ac |
|---|---|
| 466 remainings = [] | 466 remainings = [] |
| 467 for source, sourcerev, tagname in pendings: | 467 for source, sourcerev, tagname in pendings: |
| 468 if source.startswith(srctagspath): | 468 if source.startswith(srctagspath): |
| 469 remainings.append([source, sourcerev, tagname]) | 469 remainings.append([source, sourcerev, tagname]) |
| 470 continue | 470 continue |
| 471 # From revision may be fake, get one with changes | 471 if tagname in tags: |
| 472 # Keep the latest tag value | |
| 473 continue | |
| 474 # From revision may be fake, get one with changes | |
| 472 try: | 475 try: |
| 473 tagid = self.latest(source, sourcerev) | 476 tagid = self.latest(source, sourcerev) |
| 474 if tagid: | 477 if tagid and tagname not in tags: |
| 475 tags[tagname] = tagid | 478 tags[tagname] = tagid |
| 476 except SvnPathNotFound: | 479 except SvnPathNotFound: |
| 477 # It happens when we are following directories we assumed | 480 # It happens when we are following directories we assumed |
| 478 # were copied with their parents but were really created | 481 # were copied with their parents but were really created |
| 479 # in the tag directory. | 482 # in the tag directory. |