~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

* ``WorkingTree.rename_one`` will now raise an error if normalisation of the
  new path causes bzr to be unable to access the file. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
365
365
        # find the location in the block.
366
366
        # check its not there
367
367
        # add it.
368
 
        #------- copied from inventory.make_entry
 
368
        #------- copied from inventory.ensure_normalized_name - keep synced.
369
369
        # --- normalized_filename wants a unicode basename only, so get one.
370
370
        dirname, basename = osutils.split(path)
371
371
        # we dont import normalized_filename directly because we want to be