~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-10 17:01:53 UTC
mfrom: (6015.15.7 2.4-tag-fetch-flag-771184)
mto: (6015.24.1 2.4) (6060.2.1 trunk) (6069.1.1 trunk) (6089.1.1 trunk) (6090.1.1 trunk) (6092.1.1 810701-lang-not-set) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6206.1.1 2.5-client-reconnect-819604) (6082.5.1 expand-in-stack)
mto: This revision was merged to the branch mainline in revision 6066.
Revision ID: pqm@pqm.ubuntu.com-20110810170153-hs7vuauw37vqi8qu

(jameinel) Bug #771184,
add a config entry: 'branch.fetch_tags' defaulting it to False (John A
Meinel)

added added

removed removed

681

builder.build_commit(message="Rev 2a", rev_id='rev-2a')

682

source.tags.set_tag('tag-a', 'rev-2a')

683

source.set_last_revision_info(1, 'rev-1')

684

source.get_config().set_user_option('branch.fetch_tags', 'True')

684

685

builder.build_commit(message="Rev 2b", rev_id='rev-2b')

685

686

# Merge from source

686

687

self.run_bzr('merge -d target source')