← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-05 16:03:11 UTC
  • mfrom: (6432 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6433.
  • Revision ID: jelmer@samba.org-20120105160311-12o5p67kin1v3zps
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
681
681
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
682
682
        source.tags.set_tag('tag-a', 'rev-2a')
683
683
        source.set_last_revision_info(1, 'rev-1')
684
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
684
        source.get_config_stack().set('branch.fetch_tags', True)
685
685
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
686
686
        # Merge from source
687
687
        self.run_bzr('merge -d target source')