/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/switch.py

A few more bug fixes.

Handle when a location changes file_id. We were looking up the path
in the active tree, we need to look it up in the basis_tree.
Add a direct test for the 'switch' case, which is when setting
a parent_tree to something new, and the basis_tree is no longer
in the available repository.
Add a couple more direct successful delta checks. (most of the
test_inv tests were just about failing with bad deltas.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
78
78
    branch_format = control.find_branch_format()
79
79
    if branch_format.get_reference(control) is not None:
80
80
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, to_branch)
 
81
        branch_format.set_reference(control, None, to_branch)
82
82
    else:
83
83
        b = control.open_branch()
84
84
        bound_branch = b.get_bound_location()
103
103
            b.pull(to_branch, overwrite=True,
104
104
                possible_transports=possible_transports)
105
105
            b.set_bound_location(to_branch.base)
 
106
            b.set_parent(b.get_master_branch().get_parent())
106
107
        else:
107
108
            raise errors.BzrCommandError('Cannot switch a branch, '
108
109
                'only a checkout.')