← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hashcache.py

  • Committer: Aaron Bentley
  • Date: 2007-12-25 04:17:50 UTC
  • mto: This revision was merged to the branch mainline in revision 3160.
  • Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
https://launchpad.net/bugs/177390
Handle non-directory parent conflicts (abentley, #177390)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hashcache.py
210
210
            outf.write(CACHE_HEADER)
211
211
 
212
212
            for path, c  in self._cache.iteritems():
 
213
                assert '//' not in path, path
213
214
                line_info = [path.encode('utf-8'), '// ', c[0], ' ']
214
215
                line_info.append(' '.join([str(fld) for fld in c[1]]))
215
216
                line_info.append('\n')