← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge from integration.

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