← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
115
115
                    if file_id is not None:
116
116
                        new_path = self.this_tree.relpath(new_name)
117
117
                        rename(new_name, name)
118
 
                        self.this_tree.branch.rename_one(relpath, new_path)
119
 
                        assert self.this_tree.id2path(file_id) == relpath
120
 
                        self.this_tree._inventory = self.this_tree.read_working_inventory()
 
118
                        self.this_tree.rename_one(relpath, new_path)
121
119
                        assert self.this_tree.id2path(file_id) == new_path
122
120
        except OSError, e:
123
121
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
312
310
    clients might prefer to call merge_inner(), which has less magic behavior.
313
311
    """
314
312
    if this_dir is None:
315
 
        this_dir = '.'
 
313
        this_dir = u'.'
316
314
    this_branch = Branch.open_containing(this_dir)[0]
317
315
    if show_base and not merge_type is ApplyMerge3:
318
316
        raise BzrCommandError("Show-base is not supported for this merge"
556
554
        adjust_ids = []
557
555
        for id, path in inv_changes.iteritems():
558
556
            if path is not None:
559
 
                if path == '.':
560
 
                    path = ''
 
557
                if path == u'.':
 
558
                    path = u''
561
559
                else:
562
 
                    assert path.startswith('.' + os.sep), "path is %s" % path
 
560
                    assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
563
561
                path = path[2:]
564
562
            adjust_ids.append((path, id))
565
563
        if len(adjust_ids) > 0: