Mercurial > hg
changeset 5896:ff7fb4f0db53
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 19 Jan 2008 14:48:31 +0100 |
| parents | f1ac41359b36 (current diff) b32a0596b2d7 (diff) |
| children | 158fa833d243 |
| files | hgext/convert/subversion.py |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Sat Jan 19 13:19:27 2008 +0100 +++ b/hgext/convert/subversion.py Sat Jan 19 14:48:31 2008 +0100 @@ -490,7 +490,12 @@ fromrev = froment.copyfrom_rev self.ui.debug("Info: %s %s %s %s\n" % (frompath, froment, ent, entrypath)) - fromkind = svn.ra.check_path(self.ra, entrypath, fromrev) + # We can avoid the reparent calls if the module has not changed + # but it probably does not worth the pain. + self.reparent('') + fromkind = svn.ra.check_path(self.ra, entrypath.strip('/'), fromrev) + self.reparent(self.module) + if fromkind == svn.core.svn_node_file: # a deleted file entries.append(self.recode(entry)) elif fromkind == svn.core.svn_node_dir: