/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 bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2007-06-06 01:28:18 UTC
  • mto: This revision was merged to the branch mainline in revision 2509.
  • Revision ID: aaron.bentley@utoronto.ca-20070606012818-ubf8cmaj1imntttb
Updates from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
206
206
        suitable, so we have to rename them.
207
207
        """
208
208
        for trans_id in trans_ids:
 
209
            if trans_id not in self._new_contents:
 
210
                del self._limbo_files[trans_id]
 
211
                continue
209
212
            old_path = self._limbo_files[trans_id]
210
213
            new_path = self._limbo_name(trans_id, from_scratch=True)
211
 
            if trans_id in self._new_contents:
212
 
                os.rename(old_path, new_path)
 
214
            os.rename(old_path, new_path)
213
215
 
214
216
    def adjust_root_path(self, name, parent):
215
217
        """Emulate moving the root by moving all children, instead.