/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

  • Committer: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
508
508
        basis = self.basis_tree()
509
509
        basis.lock_read()
510
510
        try:
511
 
            changes = self._iter_changes(basis, True, [self.id2path(file_id)],
 
511
            changes = self.iter_changes(basis, True, [self.id2path(file_id)],
512
512
                require_versioned=True).next()
513
513
            changed_content, kind = changes[2], changes[6]
514
514
            if not changed_content:
1935
1935
            has_changed_files = len(unknown_nested_files) > 0
1936
1936
            if not has_changed_files:
1937
1937
                for (file_id, path, content_change, versioned, parent_id, name,
1938
 
                     kind, executable) in self._iter_changes(self.basis_tree(),
 
1938
                     kind, executable) in self.iter_changes(self.basis_tree(),
1939
1939
                         include_unchanged=True, require_versioned=False,
1940
1940
                         want_unversioned=True, specific_files=files):
1941
1941
                    if versioned == (False, False):
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:
2698
2698
        except errors.NoSuchFile:
2699
2699
            raise errors.NoWorkingTree(base=transport.base)
2700
2700
        except KeyError:
2701
 
            raise errors.UnknownFormatError(format=format_string)
 
2701
            raise errors.UnknownFormatError(format=format_string,
 
2702
                                            kind="working tree")
2702
2703
 
2703
2704
    def __eq__(self, other):
2704
2705
        return self.__class__ is other.__class__