← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.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/revision.py
151
151
        if b_ancestors.has_key(revision):
152
152
            a_intersection.append((a_distance, a_order, revision))
153
153
            b_intersection.append((b_ancestors[revision][1], a_order, revision))
154
 
    mutter("a intersection: %r" % a_intersection)
155
 
    mutter("b intersection: %r" % b_intersection)
 
154
    mutter("a intersection: %r", a_intersection)
 
155
    mutter("b intersection: %r", b_intersection)
156
156
 
157
157
    a_closest = __get_closest(a_intersection)
158
158
    if len(a_closest) == 0:
159
159
        return None
160
160
    b_closest = __get_closest(b_intersection)
161
161
    assert len(b_closest) != 0
162
 
    mutter ("a_closest %r" % a_closest)
163
 
    mutter ("b_closest %r" % b_closest)
 
162
    mutter ("a_closest %r", a_closest)
 
163
    mutter ("b_closest %r", b_closest)
164
164
    if a_closest[0] in b_closest:
165
165
        return a_closest[0]
166
166
    elif b_closest[0] in a_closest: