Show More
@@ -160,11 +160,21 b' class convert_svn(converter_source):' | |||||
160 | svn.ra.reparent(self.ra, svn_url.encode(self.encoding)) |
|
160 | svn.ra.reparent(self.ra, svn_url.encode(self.encoding)) | |
161 |
|
161 | |||
162 | def _fetch_revisions(self, from_revnum = 0, to_revnum = 347, pb=None): |
|
162 | def _fetch_revisions(self, from_revnum = 0, to_revnum = 347, pb=None): | |
|
163 | # batching is broken for branches | |||
|
164 | to_revnum = 0 | |||
163 | if not hasattr(self, 'child_rev'): |
|
165 | if not hasattr(self, 'child_rev'): | |
164 | self.child_rev = from_revnum |
|
166 | self.child_rev = from_revnum | |
165 | self.child_cset = self.commits.get(self.child_rev) |
|
167 | self.child_cset = self.commits.get(self.child_rev) | |
166 | else: |
|
168 | else: | |
167 | self.commits[self.child_rev] = self.child_cset |
|
169 | self.commits[self.child_rev] = self.child_cset | |
|
170 | # batching broken | |||
|
171 | return | |||
|
172 | # if the branch was created in the middle of the last batch, | |||
|
173 | # svn log will complain that the path doesn't exist in this batch | |||
|
174 | # so we roll the parser back to the last revision where this branch appeared | |||
|
175 | revnum = self.revnum(self.child_rev) | |||
|
176 | if revnum > from_revnum: | |||
|
177 | from_revnum = revnum | |||
168 |
|
178 | |||
169 | self.ui.debug('Fetching revisions %d to %d\n' % (from_revnum, to_revnum)) |
|
179 | self.ui.debug('Fetching revisions %d to %d\n' % (from_revnum, to_revnum)) | |
170 |
|
180 |
General Comments 0
You need to be logged in to leave comments.
Login now