← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/fakevfat.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/fakevfat.py
38
38
 
39
39
"""
40
40
 
 
41
from __future__ import absolute_import
 
42
 
41
43
import re
42
44
 
43
 
from bzrlib.errors import TransportNotPossible
44
45
from bzrlib.transport import decorator
45
46
 
46
47