← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to upstream_import.py

  • Committer: Max Bowsher
  • Date: 2009-11-07 17:08:08 UTC
  • mto: This revision was merged to the branch mainline in revision 739.
  • Revision ID: maxb@f2s.com-20091107170808-sp9xobs68r11n7ur
https://launchpad.net/bugs/237933
Skip importing .bzr, to avoid creating a malformed tree transform.

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
201
201
        if prefix is not None:
202
202
            relative_path = relative_path[len(prefix)+1:]
203
203
            relative_path = relative_path.rstrip('/')
 
204
        if relative_path == '.bzr' or relative_path.startswith('.bzr/'):
 
205
            continue
204
206
        if relative_path == '':
205
207
            continue
206
208
        add_implied_parents(implied_parents, relative_path)