← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
59
59
    try:
60
60
        remote_branch.lock_read()
61
61
        try:
 
62
            # check for special case: both branches are equivalent
 
63
            if (local_branch.last_revision_info() ==
 
64
                remote_branch.last_revision_info()):
 
65
                return [], []
62
66
            local_rev_history, local_rev_history_map = \
63
67
                _get_history(local_branch, progress, "local", 0)
64
68
            remote_rev_history, remote_rev_history_map = \