##// END OF EJS Templates
convert: svn: check for branch movement in any log entry, not just the first....
Brendan Cully -
r5250:58547180 default
parent child Browse files
Show More
@@ -539,12 +539,9 b' class convert_svn(converter_source):'
539 return
539 return
540
540
541 parents = []
541 parents = []
542 orig_paths = orig_paths.items()
543 orig_paths.sort()
544
545 # check whether this revision is the start of a branch
542 # check whether this revision is the start of a branch
546 path, ent = orig_paths and orig_paths[0] or (None, None)
543 if self.module in orig_paths:
547 if ent and path == self.module:
544 ent = orig_paths[self.module]
548 if ent.copyfrom_path:
545 if ent.copyfrom_path:
549 # ent.copyfrom_rev may not be the actual last revision
546 # ent.copyfrom_rev may not be the actual last revision
550 prev = self.latest(ent.copyfrom_path, ent.copyfrom_rev)
547 prev = self.latest(ent.copyfrom_path, ent.copyfrom_rev)
@@ -557,6 +554,8 b' class convert_svn(converter_source):'
557
554
558 self.modulemap[revnum] = self.module # track backwards in time
555 self.modulemap[revnum] = self.module # track backwards in time
559
556
557 orig_paths = orig_paths.items()
558 orig_paths.sort()
560 paths = []
559 paths = []
561 # filter out unrelated paths
560 # filter out unrelated paths
562 for path, ent in orig_paths:
561 for path, ent in orig_paths:
General Comments 0
You need to be logged in to leave comments. Login now