← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-06 06:48:25 UTC
  • mfrom: (4070.8.6 debug-config)
  • Revision ID: pqm@pqm.ubuntu.com-20090306064825-kbpwggw21dygeix6
(mbp) debug_flags configuration option

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
from StringIO import StringIO
35
35
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
36
36
from bzrlib.osutils import pathjoin, file_kind
37
37
from bzrlib.tests import TestCaseWithTransport, TestCaseWithMemoryTransport
 
38
from bzrlib.trace import (enable_test_log, disable_test_log)
38
39
from bzrlib.workingtree import WorkingTree
39
40
 
40
41
 
312
313
        merger.do_merge()
313
314
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
314
315
 
315
 
    def test_Merger_defaults_to_DummyProgress(self):
316
 
        branch = self.make_branch('branch')
317
 
        merger = _mod_merge.Merger(branch, pb=None)
318
 
        self.assertIsInstance(merger._pb, progress.DummyProgress)
319
 
 
320
316
    def prepare_cherrypick(self):
321
317
        """Prepare a pair of trees for cherrypicking tests.
322
318