← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Alexander Belchenko
  • Date: 2008-02-16 10:03:17 UTC
  • mfrom: (3224 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080216100317-xg1hdw306evlgt94
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1951
1951
                                                 path_utf8=old_path)
1952
1952
                    # update the source details variable to be the real
1953
1953
                    # location.
 
1954
                    if old_entry == (None, None):
 
1955
                        raise errors.CorruptDirstate(state._filename,
 
1956
                            "entry '%s/%s' is considered renamed from %r"
 
1957
                            " but source does not exist\n"
 
1958
                            "entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
1954
1959
                    source_details = old_entry[1][source_index]
1955
1960
                    source_minikind = source_details[0]
1956
1961
                else: