← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_pyx.pyx

  • Committer: Robert Collins
  • Date: 2009-10-01 00:56:56 UTC
  • mfrom: (4634.52.7 2.0)
  • mto: (4634.52.8 2.0)
  • mto: This revision was merged to the branch mainline in revision 4723.
  • Revision ID: robertc@robertcollins.net-20091001005656-c4rd6cl5jxt6opvk
Merge 2.0 to fix NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_dirstate_helpers_pyx.pyx
1202
1202
                        content_change = 0
1203
1203
                    target_exec = False
1204
1204
                else:
1205
 
                    raise Exception, "unknown kind %s" % path_info[2]
 
1205
                    if path is None:
 
1206
                        path = self.pathjoin(old_dirname, old_basename)
 
1207
                    raise errors.BadFileKindError(path, path_info[2])
1206
1208
            if source_minikind == c'd':
1207
1209
                if path is None:
1208
1210
                    old_path = path = self.pathjoin(old_dirname, old_basename)