/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: John Arbash Meinel
  • Date: 2010-03-03 22:59:21 UTC
  • mfrom: (4797.2.24 2.1)
  • mto: (4797.2.26 2.1)
  • mto: This revision was merged to the branch mainline in revision 5075.
  • Revision ID: john@arbash-meinel.com-20100303225921-trqn6j10kabpzii6
merge 2.1, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
2894
2894
                        base=False, other=False)
2895
2895
        return builder
2896
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()