/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/bzr/dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2584
2584
            return
2585
2585
        if new_id.__class__ != bytes:
2586
2586
            raise AssertionError(
2587
 
                "must be a utf8 file_id not %s" % (type(file_id), ))
 
2587
                "must be a utf8 file_id not %s" % (type(new_id), ))
2588
2588
        # mark the old path absent, and insert a new root path
2589
2589
        self._make_absent(entry)
2590
2590
        self.update_minimal((b'', b'', new_id), b'd',