← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
64
64
                     'test_dpush',
65
65
                     'test_exceptions',
66
66
                     'test_export',
 
67
                     'test_export_pot',
67
68
                     'test_filesystem_cicp',
68
69
                     'test_filtered_view_ops',
69
70
                     'test_find_merge_base',
84
85
                     'test_merge',
85
86
                     'test_merge_directive',
86
87
                     'test_missing',
 
88
                     'test_mkdir',
87
89
                     'test_modified',
88
90
                     'test_mv',
89
91
                     'test_nick',
112
114
                     'test_send',
113
115
                     'test_serve',
114
116
                     'test_shared_repository',
 
117
                     'test_shell_complete',
115
118
                     'test_shelve',
116
119
                     'test_sign_my_commits',
117
120
                     'test_split',