← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge from mbp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
310
310
    clients might prefer to call merge_inner(), which has less magic behavior.
311
311
    """
312
312
    if this_dir is None:
313
 
        this_dir = '.'
 
313
        this_dir = u'.'
314
314
    this_branch = Branch.open_containing(this_dir)[0]
315
315
    if show_base and not merge_type is ApplyMerge3:
316
316
        raise BzrCommandError("Show-base is not supported for this merge"
554
554
        adjust_ids = []
555
555
        for id, path in inv_changes.iteritems():
556
556
            if path is not None:
557
 
                if path == '.':
558
 
                    path = ''
 
557
                if path == u'.':
 
558
                    path = u''
559
559
                else:
560
560
                    assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
561
561
                path = path[2:]