/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: 2020-08-06 01:19:45 UTC
  • mto: (7490.40.103 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200806011945-6vud9e83lqy3ssh2
q

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
253
253
        """Change the path that is assigned to a transaction id."""
254
254
        if parent is None:
255
255
            raise ValueError("Parent trans-id may not be None")
256
 
        if trans_id == self._new_root:
 
256
        if trans_id == self.root:
257
257
            raise CantMoveRoot
258
258
        self._new_name[trans_id] = name
259
259
        self._new_parent[trans_id] = parent
1249
1249
            new_parent_id = tt.new_directory(parent_name + '.new',
1250
1250
                                             parent_parent, parent_file_id)
1251
1251
            _reparent_transform_children(tt, parent_id, new_parent_id)
1252
 
            if parent_file_id is not None:
 
1252
            if tt.final_is_versioned(parent_id):
1253
1253
                tt.unversion_file(parent_id)
1254
1254
            new_conflicts.add((c_type, 'Created directory', new_parent_id))
1255
1255
        elif c_type == 'versioning no contents':