← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

[merge] bzr.dev 2298 (broken)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
20
20
"""
21
21
 
22
22
 
23
 
from bzrlib import tree
 
23
from bzrlib import (
 
24
    osutils,
 
25
    tree,
 
26
    )
24
27
from bzrlib.decorators import needs_read_lock, needs_write_lock
25
28
from bzrlib.osutils import splitpath
26
29
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER
90
93
            ids = [None] * len(files)
91
94
        else:
92
95
            assert(len(ids) == len(files))
 
96
            ids = [osutils.safe_file_id(file_id) for file_id in ids]
93
97
 
94
98
        if kinds is None:
95
99
            kinds = [None] * len(files)