Commits

Ronny Pfannschmidt committed 55f921c

undo the branch name mess collisions are better than sudden branch name change

Comments (0)

Files changed (2)

bin/replay-hg-history.py

                 base = maybe_replay_commit(target_repo,
                                            base=base,
                                            source_ctx=source_ctx,
-                                           target_branch=str(chunk.guessed_name()),
+                                           target_branch=str(chunk.guessed_name()).split('@')[0]
                                           )
                 rev += 1
                 total_converted += 1

hackbeil/histevents.py

             if self.end is None:
                 return self.branch.path.split('/')[-1]
             else:
-                return 'historic/' + targetdirname(self.branch)
+                return targetdirname(self.branch)
 
     def __repr__(self):
         return '<{branch.path}@{start}-{end}>'.format(**vars(self))