← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Hacking notes on TDD

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
226
226
        self.conflict("Three-way conflict merging %s" % filename)
227
227
 
228
228
    def finalize(self):
229
 
        if self.conflicts == 0:
230
 
            if not self.ignore_zero:
231
 
                note("All changes applied successfully.")
232
 
        else:
 
229
        if not self.ignore_zero:
233
230
            note("%d conflicts encountered." % self.conflicts)
234
231
            
235
232
def get_tree(treespec, local_branch=None):
313
310
    clients might prefer to call merge_inner(), which has less magic behavior.
314
311
    """
315
312
    if this_dir is None:
316
 
        this_dir = u'.'
 
313
        this_dir = '.'
317
314
    this_branch = Branch.open_containing(this_dir)[0]
318
315
    if show_base and not merge_type is ApplyMerge3:
319
316
        raise BzrCommandError("Show-base is not supported for this merge"
557
554
        adjust_ids = []
558
555
        for id, path in inv_changes.iteritems():
559
556
            if path is not None:
560
 
                if path == u'.':
561
 
                    path = u''
 
557
                if path == '.':
 
558
                    path = ''
562
559
                else:
563
 
                    assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
 
560
                    assert path.startswith('.' + os.sep), "path is %s" % path
564
561
                path = path[2:]
565
562
            adjust_ids.append((path, id))
566
563
        if len(adjust_ids) > 0: