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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2161
2161
          basis.
2162
2162
        - Do a 'normal' merge of the old branch basis if it is relevant.
2163
2163
        """
2164
 
        if self.branch.get_master_branch(possible_transports) is not None:
 
2164
        if self.branch.get_bound_location() is not None:
2165
2165
            self.lock_write()
2166
2166
            update_branch = True
2167
2167
        else: