/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/workingtree_implementations/test_add_reference.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_add_reference.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
 
79
79
        sub_tree = self.make_branch_and_tree('tree/sub-tree')
80
80
        sub_tree.set_root_id('root-id')
81
81
        try:
82
 
            self.assertRaises(errors.BadReferenceTarget, tree.add_reference, 
 
82
            self.assertRaises(errors.BadReferenceTarget, tree.add_reference,
83
83
                              sub_tree)
84
84
        except errors.UnsupportedOperation:
85
85
            self._references_unsupported(tree)
89
89
        tree, sub_tree = self.make_trees()
90
90
        sub_tree.set_root_id('file1-id')
91
91
        try:
92
 
            self.assertRaises(errors.BadReferenceTarget, tree.add_reference, 
 
92
            self.assertRaises(errors.BadReferenceTarget, tree.add_reference,
93
93
                              sub_tree)
94
94
        except errors.UnsupportedOperation:
95
95
            self._references_unsupported(tree)
99
99
        os.rename('tree/sub-tree', 'sibling')
100
100
        sibling = workingtree.WorkingTree.open('sibling')
101
101
        try:
102
 
            self.assertRaises(errors.BadReferenceTarget, tree.add_reference, 
 
102
            self.assertRaises(errors.BadReferenceTarget, tree.add_reference,
103
103
                              sibling)
104
104
        except errors.UnsupportedOperation:
105
105
            self._references_unsupported(tree)