← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
18
18
import errno
19
19
from stat import S_ISREG
20
20
 
21
 
from bzrlib import BZRDIR
22
21
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
23
22
                           ReusingTransform, NotVersionedError, CantMoveRoot,
24
23
                           ExistingLimbo, ImmortalLimbo)
502
501
            
503
502
        for child in children:
504
503
            childpath = joinpath(path, child)
505
 
            if childpath == BZRDIR:
 
504
            if self._tree.is_control_filename(childpath):
506
505
                continue
507
506
            yield self.get_tree_path_id(childpath)
508
507