Show More
@@ -700,20 +700,14 b' class svn_source(converter_source):' | |||
|
700 | 700 | nroot = path.strip('/') |
|
701 | 701 | children = self._find_children(oroot, fromrev) |
|
702 | 702 | children = [s.replace(oroot,nroot) for s in children] |
|
703 | # Mark all [files, not directories] as deleted. | |
|
703 | ||
|
704 | 704 | for child in children: |
|
705 | # Can we move a child directory and its | |
|
706 | # parent in the same commit? (probably can). Could | |
|
707 | # cause problems if instead of revnum -1, | |
|
708 | # we have to look in (copyfrom_path, revnum - 1) | |
|
709 | entrypath = self.getrelpath("/" + child, module=old_module) | |
|
710 |
|
|
|
711 | entry = self.recode(entrypath.decode(self.encoding)) | |
|
712 | if entry in copies: | |
|
713 | # deleted file within a copy | |
|
714 | del copies[entry] | |
|
715 | else: | |
|
716 | entries.append(entry) | |
|
705 | entrypath = self.getrelpath("/" + child, old_module) | |
|
706 | if not entrypath: | |
|
707 | continue | |
|
708 | if entrypath in copies: | |
|
709 | del copies[entrypath] | |
|
710 | entries.append(entrypath) | |
|
717 | 711 | else: |
|
718 | 712 | self.ui.debug(_('unknown path in revision %d: %s\n') % \ |
|
719 | 713 | (revnum, path)) |
General Comments 0
You need to be logged in to leave comments.
Login now