/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/hashcache.py

  • Committer: John Arbash Meinel
  • Date: 2009-05-01 18:09:24 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090501180924-bco4vmhymopg5lls
Different sides deleting different amounts is now a conflict.

This is because the final 'lines' are different, but something occurred
on each side.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hashcache.py
180
180
                filters = self._filter_provider(path=path, file_id=None)
181
181
            digest = self._really_sha1_file(abspath, filters)
182
182
        elif stat.S_ISLNK(mode):
183
 
            target = osutils.readlink(osutils.safe_unicode(abspath))
184
 
            digest = osutils.sha_string(target.encode('UTF-8'))
 
183
            digest = osutils.sha_string(os.readlink(abspath))
185
184
        else:
186
185
            raise errors.BzrError("file %r: unknown file stat mode: %o"
187
186
                                  % (abspath, mode))