- Committer: Canonical.com Patch Queue Manager
- Date: 2007-03-09 22:57:21 UTC
- mfrom: (1551.12.48 mergedirective)
- Revision ID: pqm@pqm.ubuntu.com-20070309225721-d395866527ca9a47
Add support for merge directives
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
blackbox
|
1185.31.15 | 19 years ago | John Arbash Meinel | Refactoring blackbox tests into a package, rather |
|
||
|
branch_implementations
|
1534.4.23 | 18 years ago | Robert Collins | Move branch implementations tests into a package. |
|
||
|
bzrdir_implementations
|
1534.4.39 | 18 years ago | Robert Collins | Basic BzrDir support. |
|
||
|
interrepository_implementations
|
1534.1.29 | 18 years ago | Robert Collins | Add a test environment for InterRepository objects |
|
||
|
intertree_implementations
|
1852.8.3 | 18 years ago | Robert Collins | Implement an InterTreeTestProvider and a trivial t |
|
||
|
interversionedfile_implementations
|
1563.2.12 | 18 years ago | Robert Collins | Checkpointing: created InterObject to factor out c |
|
||
|
repository_implementations
|
1534.4.40 | 18 years ago | Robert Collins | Add RepositoryFormats and allow bzrdir.open or cre |
|
||
|
revisionstore_implementations
|
1563.2.21 | 18 years ago | Robert Collins | Smoke test for RevisionStore factories creating re |
|
||
|
test_patches_data
|
1731.1.17 | 18 years ago | Aaron Bentley | Merge bzr.dev |
|
||
|
tree_implementations
|
1852.6.1 | 18 years ago | Robert Collins | Start tree implementation tests. |
|
||
|
workingtree_implementations
|
1534.4.46 | 18 years ago | Robert Collins | Nearly complete .bzr/checkout splitout. |
|
||
__init__.py |
1551.12.37 | 17 years ago | Aaron Bentley | Merge bzr.dev | 79.6 KB |
|
|
|
EncodingAdapter.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.1 KB |
|
|
|
HttpServer.py |
2183.1.1 | 18 years ago | Aaron Bentley | Make test HTTP server's range handling more spec-c | 13.2 KB |
|
|
|
HTTPTestUtil.py |
2213.1.1 | 18 years ago | v.ladeuil+lp at free | Workaround SimpleHTTPRequestHandler.translate_path | 8.8 KB |
|
|
|
lock_helpers.py |
1711.8.7 | 18 years ago | John Arbash Meinel | Renaming LockHelpers.py to lock_helpers.py | 2.8 KB |
|
|
|
stub_sftp.py |
1963.2.7 | 18 years ago | Robey Pointer | merge from bzr.dev | 7.8 KB |
|
|
|
test_ancestry.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 2.2 KB |
|
|
|
test_annotate.py |
2245.3.1 | 17 years ago | John Arbash Meinel | bzr annotate should use Branch's dotted revnos. No | 10.9 KB |
|
|
|
test_api.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.3 KB |
|
|
|
test_atomicfile.py |
1982.1.1 | 18 years ago | Alexander Belchenko | Explicitly skip tests with file attribute manipula | 4.6 KB |
|
|
|
test_bad_files.py |
2255.7.34 | 17 years ago | John Arbash Meinel | Clean up test_bad_files, and fix a bug in _iter_ch | 3 KB |
|
|
|
test_branch.py |
2255.2.224 | 17 years ago | Martin Pool | TestBranch6 doesn't need to do add('.') | 13.7 KB |
|
|
|
test_bundle.py |
2255.2.211 | 17 years ago | Robert Collins | Remove knit2 repository format- it has never been | 38.4 KB |
|
|
|
test_bzrdir.py |
2255.2.211 | 17 years ago | Robert Collins | Remove knit2 repository format- it has never been | 32.3 KB |
|
|
|
test_cache_utf8.py |
2255.7.95 | 17 years ago | Robert Collins | Add convenience utf8 decode routine for handling s | 4 KB |
|
|
|
test_commands.py |
2155.2.3 | 18 years ago | Marius Kruger | * commands.py - fixed spelling mistake: usefull | 3.5 KB |
|
|
|
test_commit.py |
1551.12.35 | 17 years ago | Aaron Bentley | Merge bzr.dev | 25.9 KB |
|
|
|
test_commit_merge.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 3.8 KB |
|
|
|
test_config.py |
2309.2.6 | 17 years ago | Alexander Belchenko | bzr now use Win32 API to determine Application Dat | 38.6 KB |
|
|
|
test_conflicts.py |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 4.9 KB |
|
|
|
test_decorators.py |
2230.2.4 | 17 years ago | John Arbash Meinel | Add tests that decorators generate useful wrappers | 6.7 KB |
|
|
|
test_delta.py |
1551.10.25 | 17 years ago | Aaron Bentley | Make ChangeReporter private | 11.3 KB |
|
|
|
test_diff.py |
2240.1.1 | 17 years ago | Alexander Belchenko | test_external_diff_binary: run external diff with | 27 KB |
|
|
|
test_dirstate.py |
2255.2.239 | 17 years ago | Robert Collins | Change from adler to crc checksums, as adler32 in | 80.7 KB |
|
|
|
test_doc_generate.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.2 KB |
|
|
|
test_errors.py |
2255.7.16 | 17 years ago | John Arbash Meinel | Make sure adding a duplicate file_id raises Duplic | 11 KB |
|
|
|
test_escaped_store.py |
2309.4.6 | 17 years ago | John Arbash Meinel | Update the 'escaped store' tests to use both unico | 5.4 KB |
|
|
|
test_extract.py |
2255.2.194 | 17 years ago | Robert Collins | [BROKEN] Many updates to stop using experimental f | 3.3 KB |
|
|
|
test_fetch.py |
2255.2.211 | 17 years ago | Robert Collins | Remove knit2 repository format- it has never been | 13.2 KB |
|
|
|
test_ftp_transport.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.1 KB |
|
|
|
test_generate_docs.py |
2229.1.2 | 17 years ago | جاون عرباش ماينل | Allow tests to skip after installation, since cert | 1.7 KB |
|
|
|
test_generate_ids.py |
2294.1.10 | 17 years ago | John Arbash Meinel | Switch all apis over to utf8 file ids. All tests p | 7.2 KB |
|
|
|
test_globbing.py |
2298.8.2 | 17 years ago | Kent Gibson | Review fixes for lp86451 patch. | 10.6 KB |
|
|
|
test_gpg.py |
2273.1.2 | 17 years ago | John Arbash Meinel | Cleanup docstring for Aaron Bentley | 3.4 KB |
|
|
|
test_graph.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.9 KB |
|
|
|
test_hashcache.py |
2012.1.7 | 18 years ago | Aaron Bentley | Get tree._iter_changed down to ~ 1 stat per file | 7.2 KB |
|
|
|
test_http.py |
2314.1.1 | 17 years ago | John Arbash Meinel | (Vincent Ladeuil) invalid proxy vars should not ca | 32.9 KB |
|
|
|
test_http_response.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 24.4 KB |
|
|
|
test_https_ca_bundle.py |
2298.5.2 | 17 years ago | Alexander Belchenko | Don't look in cwd for CA bundle (note from John) | 2.3 KB |
|
|
|
test_identitymap.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.7 KB |
|
|
|
test_ignores.py |
2298.8.3 | 17 years ago | Kent Gibson | Extended test cases to test bug 86451. | 5.3 KB |
|
|
|
test_inv.py |
2255.2.236 | 17 years ago | Martin Pool | Review cleanups: mostly updating or removing todo | 26.3 KB |
|
|
|
test_knit.py |
2249.5.12 | 17 years ago | John Arbash Meinel | Change the APIs for VersionedFile, Store, and some | 45.1 KB |
|
|
|
test_lazy_import.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 39.1 KB |
|
|
|
test_lazy_regex.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 4.6 KB |
|
|
|
test_lockable_files.py |
2249.5.11 | 17 years ago | John Arbash Meinel | Audit Branch to ensure utf8 revision ids. Requires | 7 KB |
|
|
|
test_lockdir.py |
1551.10.4 | 17 years ago | Aaron Bentley | Update to skip on win32 | 22 KB |
|
|
|
test_log.py |
2120.4.1 | 18 years ago | James Westby | Delete duplicate test_cur_revno test. | 14.9 KB |
|
|
|
test_memorytree.py |
1731.1.64 | 18 years ago | Aaron Bentley | Fix up more memorytree tests | 6.2 KB |
|
|
|
test_merge.py |
2255.2.217 | 17 years ago | Martin Pool | docs | 10.4 KB |
|
|
|
test_merge3.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 12.6 KB |
|
|
|
test_merge_core.py |
2255.7.14 | 17 years ago | John Arbash Meinel | Make set_root_id() a no-op if the id doesn't chang | 27.2 KB |
|
|
|
test_merge_directive.py |
1551.12.45 | 17 years ago | Aaron Bentley | Change format marker to not experimental | 9.7 KB |
|
|
|
test_missing.py |
2204.1.1 | 18 years ago | John Arbash Meinel | 'bzr missing -v' was showing adds as deletes. | 4.9 KB |
|
|
|
test_msgeditor.py |
2258.3.2 | 17 years ago | James Westby | Allow an empty start message. Following comments | 6.5 KB |
|
|
|
test_nonascii.py |
2204.3.3 | 18 years ago | Alexander Belchenko | Don't formats unicode strings in test error messag | 6.8 KB |
|
|
|
test_options.py |
1551.12.24 | 17 years ago | Aaron Bentley | Add RegistryOption.from_swargs to simplify simple | 10.6 KB |
|
|
|
test_osutils.py |
2324.2.4 | 17 years ago | Dmitry Vasiliev | Fixed test_unicode__walkdirs_utf8 test | 36.6 KB |
|
|
|
test_osutils_encodings.py |
2192.1.10 | 17 years ago | Alexander Belchenko | merge bzr.dev | 7.2 KB |
|
|
|
test_patch.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1 KB |
|
|
|
test_patches.py |
2298.6.1 | 17 years ago | Johan Dahlberg | Fix bzrtools shelve command for removed lines begi | 7.6 KB |
|
|
|
test_permissions.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 10.5 KB |
|
|
|
test_plugins.py |
2256.2.2 | 17 years ago | Robert Collins | Allow 'import bzrlib.plugins.NAME' to work when th | 9.7 KB |
|
|
|
test_progress.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 10.6 KB |
|
|
|
test_read_bundle.py |
2167.2.1 | 18 years ago | Aaron Bentley | Fix reading bundles from http URLs | 3.3 KB |
|
|
|
test_reconcile.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.9 KB |
|
|
|
test_registry.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 10.1 KB |
|
|
|
test_repository.py |
2255.2.211 | 17 years ago | Robert Collins | Remove knit2 repository format- it has never been | 20 KB |
|
|
|
test_revert.py |
2255.7.37 | 17 years ago | Robert Collins | Dont use a basis tree that is not in the tree's pa | 4.6 KB |
|
|
|
test_revision.py |
2229.2.3 | 17 years ago | Aaron Bentley | change reserved_id to is_reserved_id, add check_no | 13 KB |
|
|
|
test_revisionnamespaces.py |
2220.2.20 | 17 years ago | Martin Pool | Tag methods now available through Branch.tags.add_ | 17.3 KB |
|
|
|
test_revisiontree.py |
1731.1.59 | 18 years ago | Aaron Bentley | Ensure the null revision has no root | 2.3 KB |
|
|
|
test_rio.py |
1551.12.22 | 17 years ago | Aaron Bentley | Fix handling of whitespace-stripping without newli | 11.7 KB |
|
|
|
test_sampler.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.3 KB |
|
|
|
test_selftest.py |
2255.2.164 | 17 years ago | Martin Pool | Change the default format for some tests from AB1 | 43.7 KB |
|
|
|
test_setup.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.3 KB |
|
|
|
test_sftp_transport.py |
2221.5.18 | 17 years ago | Dmitry Vasiliev | Fixed variable name | 18.3 KB |
|
|
|
test_smart_add.py |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 17.5 KB |
|
|
|
test_smart_transport.py |
2145.1.1 | 18 years ago | mbp at sourcefrog | merge urllib keepalive etc | 66 KB |
|
|
|
test_source.py |
2234.4.1 | 17 years ago | Wouter van Heyst | (John Arbash Meinel) Fix selftest for installed bz | 10.2 KB |
|
|
|
test_ssh_transport.py |
2221.5.17 | 17 years ago | Dmitry Vasiliev | Added comments for test_get_vendor_search_order | 7.7 KB |
|
|
|
test_status.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.1 KB |
|
|
|
test_store.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 16.9 KB |
|
|
|
test_subsume.py |
2255.2.214 | 17 years ago | Robert Collins | Get _iter_changes on dirstate passing the subtree | 5.1 KB |
|
|
|
test_symbol_versioning.py |
2227.1.2 | 17 years ago | mbp at sourcefrog | Add a simple DeprecatedDict class | 7.9 KB |
|
|
|
test_tag.py |
2255.2.194 | 17 years ago | Robert Collins | [BROKEN] Many updates to stop using experimental f | 3.1 KB |
|
|
|
test_testament.py |
2255.2.194 | 17 years ago | Robert Collins | [BROKEN] Many updates to stop using experimental f | 14.6 KB |
|
|
|
test_textfile.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.7 KB |
|
|
|
test_textmerge.py |
1185.81.31 | 18 years ago | Aaron Bentley | Use patience for two-way merge | 1.8 KB |
|
|
|
test_timestamp.py |
1551.12.36 | 17 years ago | Aaron Bentley | Fix failing tests | 1.8 KB |
|
|
|
test_trace.py |
1551.9.3 | 18 years ago | Aaron Bentley | Revert buggy apport changes | 4.5 KB |
|
|
|
test_transactions.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 12.1 KB |
|
|
|
test_transform.py |
2255.2.194 | 17 years ago | Robert Collins | [BROKEN] Many updates to stop using experimental f | 52.7 KB |
|
|
|
test_transport.py |
2245.6.2 | 17 years ago | Alexander Belchenko | Fix name of emulated Win32LocalTransport as Robert | 21.9 KB |
|
|
|
test_transport_implementations.py |
2245.6.1 | 17 years ago | Alexander Belchenko | win32 UNC path: recursive cloning UNC path to root | 51.8 KB |
|
|
|
test_tree.py |
2255.7.90 | 17 years ago | Robert Collins | Add unversioned path reporting to TreeDelta. | 4.8 KB |
|
|
|
test_treebuilder.py |
1986.1.9 | 18 years ago | Robert Collins | Update to the TreeBuilder tests. | 3.2 KB |
|
|
|
test_tsort.py |
2084 | 18 years ago | Canonical.com Patch Queue Manager | (Robert Collins) Output dotted decimal revision nu | 14.7 KB |
|
|
|
test_tuned_gzip.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.9 KB |
|
|
|
test_ui.py |
2294.4.4 | 17 years ago | Vincent Ladeuil | Provide a better implementation for testing passwo | 8.9 KB |
|
|
|
test_upgrade.py |
2255.2.196 | 17 years ago | Robert Collins | Fix test_upgrade defects related to non local or a | 22 KB |
|
|
|
test_urlutils.py |
2279.4.2 | 17 years ago | Alexander Belchenko | Don't do normpath after abspath, because this func | 23 KB |
|
|
|
test_version.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.5 KB |
|
|
|
test_version_info.py |
1731.1.51 | 18 years ago | Aaron Bentley | Merge bzr.dev | 8.8 KB |
|
|
|
test_versionedfile.py |
2309.4.7 | 17 years ago | John Arbash Meinel | Update VersionedFile tests to ensure that they can | 48.6 KB |
|
|
|
test_weave.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 27.7 KB |
|
|
|
test_whitebox.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 2.7 KB |
|
|
|
test_workingtree.py |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 13.6 KB |
|
|
|
test_workingtree_4.py |
2321.1.2 | 17 years ago | Robert Collins | Skip new tests that depend on unicode file paths. | 21.5 KB |
|
|
|
test_wsgi.py |
2018.4.11 | 18 years ago | Andrew Bennetts | Use ChrootTransportDecorator so that the WSGI serv | 9.8 KB |
|
|
|
test_xml.py |
2255.6.4 | 17 years ago | Aaron Bentley | merge from dirstate | 18.3 KB |
|
|
|
TestUtil.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 3.6 KB |
|
|
|
treeshape.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.6 KB |
|
|