← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

[merge] bzr.ab, several small bugfixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
109
109
        # logic becomes format specific, then we can have the format know how to pass this
110
110
        # on. Also note that we probably have an 'upgrade meta' which upgrades the constituent
111
111
        # parts.
112
 
        print "FIXME: control files reuse" 
 
112
        # FIXME: control files reuse
113
113
        self.control_files.lock_write()
114
114
        try:
115
115
            self.convert()
219
219
 
220
220
    def _cleanup_spare_files_after_format4(self):
221
221
        transport = self.transport.clone('.bzr')
222
 
        print "FIXME working tree upgrade foo."
 
222
        # FIXME working tree upgrade foo.
223
223
        for n in 'merged-patches', 'pending-merged-patches':
224
224
            try:
225
225
                ## assert os.path.getsize(p) == 0
242
242
        branch = self.branch
243
243
        inv = serializer_v4.read_inventory(branch.control_files.get('inventory'))
244
244
        new_inv_xml = serializer_v5.write_inventory_to_string(inv)
245
 
        print "fixme inventory is a working tree change."
 
245
        # FIXME inventory is a working tree change.
246
246
        branch.control_files.put('inventory', new_inv_xml)
247
247
 
248
248
    def _write_all_weaves(self):