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

  • Committer: Aaron Bentley
  • Date: 2008-02-24 16:42:13 UTC
  • mfrom: (3234 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: aaron@aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
494
494
 
495
495
            Note: The caller is expected to take a read-lock before calling this.
496
496
            """
 
497
            self._must_be_locked()
497
498
            if not path:
498
499
                path = self.id2path(file_id)
499
500
            mode = os.lstat(self.abspath(path)).st_mode
1953
1954
                                                 path_utf8=old_path)
1954
1955
                    # update the source details variable to be the real
1955
1956
                    # location.
 
1957
                    if old_entry == (None, None):
 
1958
                        raise errors.CorruptDirstate(state._filename,
 
1959
                            "entry '%s/%s' is considered renamed from %r"
 
1960
                            " but source does not exist\n"
 
1961
                            "entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
1956
1962
                    source_details = old_entry[1][source_index]
1957
1963
                    source_minikind = source_details[0]
1958
1964
                else: