← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

[merge] robertc's integration, updated tests to check for retcode=3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
216
216
    this_name, this_parent, this_dir = entry_data(entry.id, this)
217
217
    base_name, base_parent, base_dir = entry_data(entry.id, base)
218
218
    other_name, other_parent, other_dir = entry_data(entry.id, other)
219
 
    mutter("Dirs: this, base, other %r %r %r" % (this_dir, base_dir, other_dir))
220
 
    mutter("Names: this, base, other %r %r %r" % (this_name, base_name, other_name))
 
219
    mutter("Dirs: this, base, other %r %r %r", this_dir, base_dir, other_dir)
 
220
    mutter("Names: this, base, other %r %r %r", this_name, base_name, other_name)
221
221
    old_name = this_name
222
222
    try:
223
223
        new_name = threeway_select(this_name, base_name, other_name)