~bzr-pqm/bzr/bzr.dev

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

2894

base=False, other=False)

2895

return builder

2896

2897

def test_uses_this_branch(self):

2898

builder = self.make_text_conflict()

2899

tt = builder.make_preview_transform()

2900

self.addCleanup(tt.finalize)

2901

2897

2902

def test_affected_files_cached(self):

2898

2903

"""Ensures that the config variable is cached"""

2899

2904

builder = self.make_text_conflict()