← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/brokenrename.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/brokenrename.py
17
17
"""Transport implementation that doesn't detect clashing renames.
18
18
"""
19
19
 
20
 
from stat import S_ISDIR
 
20
from __future__ import absolute_import
21
21
 
22
22
from bzrlib import (
23
23
        errors,