← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Fix wrong conflict resolution (thanks to test coverage...).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1044
1044
            # the other tree's root is a non-root in the current tree (as when
1045
1045
            # a previously unrelated branch is merged into another)
1046
1046
            return
1047
 
        if self.tt.final_kind(other_root) is None:
 
1047
        if self.tt.final_kind(other_root) is not None:
1048
1048
            other_root_is_present = True
1049
1049
        else:
1050
1050
            # other_root doesn't have a physical representation. We still need