/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transform.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-11 11:24:20 UTC
  • mfrom: (6973.3.5 less-file-id)
  • Revision ID: jelmer@jelmer.uk-20180611112420-n8g7s0xk77o90sbd
Merge lp:~jelmer/brz/less-file-id

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
132
132
        # Mapping trans_id -> path in old tree
133
133
        self._tree_id_paths = {}
134
134
        # The trans_id that will be used as the tree root
135
 
        root_id = tree.get_root_id()
136
 
        if root_id is not None:
 
135
        if tree.is_versioned(''):
137
136
            self._new_root = self.trans_id_tree_path('')
138
137
        else:
139
138
            self._new_root = None
2871
2870
    # reverse.
2872
2871
    change_list = working_tree.iter_changes(target_tree,
2873
2872
        specific_files=specific_files, pb=pb)
2874
 
    if target_tree.get_root_id() is None:
 
2873
    if not target_tree.is_versioned(u''):
2875
2874
        skip_root = True
2876
2875
    else:
2877
2876
        skip_root = False