/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
52
52
    ignores,
53
53
    merge,
54
54
    osutils,
 
55
    revision as _mod_revision,
55
56
    revisiontree,
56
57
    textui,
57
58
    transform,
1089
1090
        # missing on access.
1090
1091
        for rev_id, tree in parents_list:
1091
1092
            rev_id = osutils.safe_revision_id(rev_id)
 
1093
            _mod_revision.check_not_reserved_id(rev_id)
1092
1094
            if tree is not None:
1093
1095
                real_trees.append((rev_id, tree))
1094
1096
            else:
2265
2267
                        # the file on disk is not present at all in the
2266
2268
                        # dirblock. Either way, report about the dirblock
2267
2269
                        # entry, and let other code handle the filesystem one.
2268
 
                        if current_path_info[1].split('/') < current_entry[0][1].split('/'):
 
2270
 
 
2271
                        # Compare the basename for these files to determine
 
2272
                        # which comes first
 
2273
                        if current_path_info[1] < current_entry[0][1]:
2269
2274
                            # extra file on disk: pass for now, but only
2270
2275
                            # increment the path, not the entry
2271
2276
                            advance_entry = False