← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-09-05 02:01:31 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: aaron.bentley@utoronto.ca-20050905020131-a2d5b7711dd6cd98
Fixed bug causing previous revision to be listed as a pending merge on pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
304
304
        merge_inner(this_branch, other_tree, base_tree, tempdir, 
305
305
                    ignore_zero=ignore_zero, backup_files=backup_files, 
306
306
                    merge_type=merge_type, interesting_ids=interesting_ids)
307
 
        if base_is_ancestor and other_rev_id is not None:
 
307
        if base_is_ancestor and other_rev_id is not None\
 
308
            and other_rev_id not in this_branch.revision_history():
308
309
            this_branch.add_pending_merge(other_rev_id)
309
310
    finally:
310
311
        shutil.rmtree(tempdir)