← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/__init__.py

[merge] bzr.dev 2255, resolve conflicts, update copyrights

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
51
51
                     'bzrlib.tests.blackbox.test_command_encoding',
52
52
                     'bzrlib.tests.blackbox.test_commit',
53
53
                     'bzrlib.tests.blackbox.test_conflicts',
 
54
                     'bzrlib.tests.blackbox.test_debug',
54
55
                     'bzrlib.tests.blackbox.test_diff',
55
56
                     'bzrlib.tests.blackbox.test_exceptions',
56
57
                     'bzrlib.tests.blackbox.test_export',
68
69
                     'bzrlib.tests.blackbox.test_merge',
69
70
                     'bzrlib.tests.blackbox.test_missing',
70
71
                     'bzrlib.tests.blackbox.test_mv',
 
72
                     'bzrlib.tests.blackbox.test_nick',
71
73
                     'bzrlib.tests.blackbox.test_outside_wt',
72
74
                     'bzrlib.tests.blackbox.test_pull',
73
75
                     'bzrlib.tests.blackbox.test_push',
75
77
                     'bzrlib.tests.blackbox.test_remerge',
76
78
                     'bzrlib.tests.blackbox.test_remove',
77
79
                     'bzrlib.tests.blackbox.test_re_sign',
 
80
                     'bzrlib.tests.blackbox.test_remove_tree',
78
81
                     'bzrlib.tests.blackbox.test_revert',
79
82
                     'bzrlib.tests.blackbox.test_revno',
80
83
                     'bzrlib.tests.blackbox.test_revision_history',