~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/merge.py

Committer: Canonical.com Patch Queue Manager
Date: 2010-02-18 01:40:56 UTC
mfrom: (4797.21.2 unbreak-merge)
mto: (4797.23.1 integration-2.1) (5053.1.1 integration) (5068.1.1 integration) (5074.1.1 integration) (5080.2.1 merge-2.1-into-devel) (5110.1.1 integration) (5050.4.1 2.2) (5159.1.1 integration) (5197.1.1 merge-2.1-into-devel) (5241.2.1 trunk) (5258.1.1 diff-header-encoding) (5244.1.1 trunk) (5263.1.1 trunk) (5297.1.1 integration) (5609.33.5 2.3) (6015.55.2 2.4-feature-flags)
mto: This revision was merged to the branch mainline in revision 5055.
Revision ID: pqm@pqm.ubuntu.com-20100218014056-g069j8chstznygk2

(abentley) Fix merge when this_tree isn't a WorkingTree.

added added

removed removed

130

"""

131

affected_files = self.affected_files

132

if affected_files is None:

133

config = self.merger.this_tree.branch.get_config()

133

config = self.merger.this_branch.get_config()

134

# Until bzr provides a better policy for caching the config, we

135

# just add the part we're interested in to the params to avoid

136

# reading the config files repeatedly (bazaar.conf, location.conf,