/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/plugins/weave_fmt/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2018-04-06 19:28:01 UTC
  • mfrom: (6940 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180406192801-0352t3rvkwsy9s51
merge lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/bzrdir.py
620
620
            self.step(gettext('Upgrading working tree'))
621
621
            self.controldir.transport.mkdir('checkout', mode=self.dir_mode)
622
622
            self.make_lock('checkout')
623
 
            self.put_format(
624
 
                'checkout', WorkingTreeFormat3())
625
 
            self.controldir.transport.delete_multi(
626
 
                self.garbage_inventories, self.pb)
 
623
            self.put_format('checkout', WorkingTreeFormat3())
 
624
            for path in self.garbage_inventories:
 
625
                self.controldir.transport.delete(path)
627
626
            for entry in checkout_files:
628
627
                self.move_entry('checkout', entry)
629
628
            if last_revision is not None: