/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/branch_implementations/__init__.py

Merge from bzr.dev, resolving the worst of the semantic conflicts, but there's
still a little bit of breakage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
# Authors: Robert Collins <robert.collins@canonical.com>
3
 
# -*- coding: utf-8 -*-
 
3
#          and others
4
4
#
5
5
# This program is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by
50
50
        'bzrlib.tests.branch_implementations.test_parent',
51
51
        'bzrlib.tests.branch_implementations.test_permissions',
52
52
        'bzrlib.tests.branch_implementations.test_pull',
 
53
        'bzrlib.tests.branch_implementations.test_tags',
53
54
        'bzrlib.tests.branch_implementations.test_push',
54
55
        'bzrlib.tests.branch_implementations.test_uncommit',
55
56
        'bzrlib.tests.branch_implementations.test_update',