← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Andrew Bennetts
  • Date: 2009-10-02 05:43:41 UTC
  • mfrom: (4634.52.10 2.0)
  • mto: This revision was merged to the branch mainline in revision 4723.
  • Revision ID: andrew.bennetts@canonical.com-20091002054341-99yxpjenx8cagpxn
Merge lp:bzr/2.0 into lp:bzr, duplicating relevant NEWS entries for 2.1.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1324
1324
                key = (dirname_utf8, basename, file_id)
1325
1325
                minikind = DirState._kind_to_minikind[inv_entry.kind]
1326
1326
                if minikind == 't':
1327
 
                    fingerprint = inv_entry.reference_revision
 
1327
                    fingerprint = inv_entry.reference_revision or ''
1328
1328
                else:
1329
1329
                    fingerprint = ''
1330
1330
                insertions[file_id] = (key, minikind, inv_entry.executable,
3328
3328
                        content_change = False
3329
3329
                    target_exec = False
3330
3330
                else:
3331
 
                    raise Exception, "unknown kind %s" % path_info[2]
 
3331
                    if path is None:
 
3332
                        path = pathjoin(old_dirname, old_basename)
 
3333
                    raise errors.BadFileKindError(path, path_info[2])
3332
3334
            if source_minikind == 'd':
3333
3335
                if path is None:
3334
3336
                    old_path = path = pathjoin(old_dirname, old_basename)