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