Show More
@@ -552,19 +552,21 b' class svn_source(converter_source):' | |||||
552 |
|
552 | |||
553 | kind = svn.ra.check_path(self.ra, entrypath, revnum) |
|
553 | kind = svn.ra.check_path(self.ra, entrypath, revnum) | |
554 | if kind == svn.core.svn_node_file: |
|
554 | if kind == svn.core.svn_node_file: | |
555 | if ent.copyfrom_path: |
|
555 | entries.append(self.recode(entry)) | |
|
556 | ||||
|
557 | if not ent.copyfrom_path: | |||
|
558 | continue | |||
556 |
|
|
559 | copyfrom_path = self.getrelpath(ent.copyfrom_path) | |
557 |
|
|
560 | if not copyfrom_path: | |
558 | self.ui.debug("Copied to %s from %s@%s\n" % |
|
561 | continue | |
559 | (entrypath, copyfrom_path, |
|
562 | self.ui.debug("copied to %s from %s@%s\n" % | |
560 |
|
|
563 | (entrypath, copyfrom_path, ent.copyfrom_rev)) | |
561 |
|
|
564 | # It's probably important for hg that the source | |
562 |
|
|
565 | # exists in the revision's parent, not just the | |
563 |
|
|
566 | # ent.copyfrom_rev | |
564 |
|
|
567 | fromkind = svn.ra.check_path(self.ra, copyfrom_path, ent.copyfrom_rev) | |
565 |
|
|
568 | if fromkind != 0: | |
566 |
|
|
569 | copies[self.recode(entry)] = self.recode(copyfrom_path) | |
567 | entries.append(self.recode(entry)) |
|
|||
568 | elif kind == 0: # gone, but had better be a deleted *file* |
|
570 | elif kind == 0: # gone, but had better be a deleted *file* | |
569 | self.ui.debug("gone from %s\n" % ent.copyfrom_rev) |
|
571 | self.ui.debug("gone from %s\n" % ent.copyfrom_rev) | |
570 |
|
572 |
General Comments 0
You need to be logged in to leave comments.
Login now