- Committer: Aaron Bentley
- Date: 2007-12-25 04:17:50 UTC
- Revision ID: aaron.bentley@utoronto.ca-20071225041750-t6chr3pmgnebvqcz
Handle non-directory parent conflicts (abentley, #177390)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
blackbox
|
1185.31.15 | 18 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. |
|
||
|
commands
|
2485.8.3 | 17 years ago | v.ladeuil+lp at free | Change the file naming to clearly separate the com |
|
||
|
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 |
|
||
|
inventory_implementations
|
2729.2.1 | 17 years ago | Martin Pool | Start adding per-inventory tests |
|
||
|
per_lock
|
2353.3.9 | 17 years ago | John Arbash Meinel | Update the lock code and test code so that if more |
|
||
|
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 |
3128.1.3 | 16 years ago | Vincent Ladeuil | Since we are there s/parameteris.*/parameteriz&/. | 110 KB |
|
|
|
EncodingAdapter.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.1 KB |
|
|
|
ftp_server.py |
3021.1.1 | 16 years ago | Vincent Ladeuil | Reproduce bug 164567. * ftp_server.py: (FTPServer | 8.4 KB |
|
|
|
HttpServer.py |
3059.2.12 | 16 years ago | Vincent Ladeuil | Spiv review feedback. * bzrlib/tests/test_http_re | 15.2 KB |
|
|
|
HTTPTestUtil.py |
3052.3.2 | 16 years ago | Vincent Ladeuil | Add tests and fix trivial bugs and other typos. * | 19.9 KB |
|
|
|
lock_helpers.py |
2018.5.146 | 17 years ago | Andrew Bennetts | Merge in the branch with the extracted lock_write | 2.8 KB |
|
|
|
stub_sftp.py |
1963.2.7 | 18 years ago | Robey Pointer | merge from bzr.dev | 7.8 KB |
|
|
|
test__dirstate_helpers.py |
2474.1.70 | 17 years ago | John Arbash Meinel | Lot's of fixes from Martin's comments. Fix signed/ | 28.8 KB |
|
|
|
test_ancestry.py |
3123.1.1 | 16 years ago | John Arbash Meinel | Update from deprecating 0.93 to 1.0, and add a 1.1 | 2.6 KB |
|
|
|
test_annotate.py |
3010.1.1 | 16 years ago | Robert Collins | Lock the tree's used to test annotate_file, and ad | 14.5 KB |
|
|
|
test_api.py |
2550.2.3 | 17 years ago | Robert Collins | Add require_api API. | 4.6 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 |
2949.5.2 | 17 years ago | Alexander Belchenko | John's review | 2.9 KB |
|
|
|
test_bisect_multi.py |
2890.2.3 | 17 years ago | Robert Collins | * New module ``bzrlib.bisect_multi`` with generic | 14.6 KB |
|
|
|
test_branch.py |
2839.6.3 | 17 years ago | Alexander Belchenko | merge bzr.dev | 14 KB |
|
|
|
test_branchbuilder.py |
2466.7.10 | 17 years ago | Robert Collins | Add a format parameter to BranchBuilder. | 2.9 KB |
|
|
|
test_bugtracker.py |
3035.3.2 | 16 years ago | Lukáš Lalinský | Add tests for InvalidBugTrackerURL. | 8.7 KB |
|
|
|
test_bundle.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 62.9 KB |
|
|
|
test_bzrdir.py |
3140.1.3 | 16 years ago | Aaron Bentley | Add support for finding branches to BzrDir | 41.8 KB |
|
|
|
test_cache_utf8.py |
2360.1.6 | 17 years ago | John Arbash Meinel | Change utf8_decode_with_None to return what we car | 4.1 KB |
|
|
|
test_commands.py |
2432.1.21 | 17 years ago | Robert Collins | Teach Command.get_help_text to show additional hel | 4.9 KB |
|
|
|
test_commit.py |
3113.6.7 | 16 years ago | Aaron Bentley | Fix commit for a checkout sharing a repo with its | 28.6 KB |
|
|
|
test_commit_merge.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 4.5 KB |
|
|
|
test_config.py |
3063.3.3 | 16 years ago | Lukáš Lalinský | Add one more test for config.parse_username(). | 51.7 KB |
|
|
|
test_conflicts.py |
3144.4.2 | 16 years ago | Aaron Bentley | Handle non-directory parent conflicts (abentley, # | 7.2 KB |
|
|
|
test_counted_lock.py |
2475.4.1 | 17 years ago | Martin Pool | Start adding CountedLock class to partially replac | 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_deprecated_graph.py |
2490.2.21 | 17 years ago | Aaron Bentley | Rename graph to deprecated_graph | 2.9 KB |
|
|
|
test_diff.py |
3131 | 16 years ago | Canonical.com Patch Queue Manager | (jam) allow _patience_diff_c to support any object | 48.9 KB |
|
|
|
test_dirstate.py |
3010.1.2 | 16 years ago | Robert Collins | Use valid file-ids for dirstate tests. | 102 KB |
|
|
|
test_email_message.py |
2639.1.2 | 17 years ago | John Arbash Meinel | Some cleanups for the EmailMessage class. Remove s | 8.2 KB |
|
|
|
test_errors.py |
3059.2.13 | 16 years ago | Vincent Ladeuil | merge bzr.dev | 19.3 KB |
|
|
|
test_escaped_store.py |
2858.2.1 | 17 years ago | Martin Pool | Remove most calls to safe_file_id and safe_revisio | 4.3 KB |
|
|
|
test_extract.py |
3113.6.5 | 16 years ago | Aaron Bentley | Update tests | 3.3 KB |
|
|
|
test_fetch.py |
3010.1.4 | 16 years ago | Robert Collins | Make the knit specific fetch tests knit specific, | 13.7 KB |
|
|
|
test_ftp_transport.py |
2900.2.25 | 17 years ago | Vincent Ladeuil | Merge bzr.dev | 4.3 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 |
2872.5.1 | 17 years ago | Martin Pool | Avoid internal error tracebacks on failure to lock | 7 KB |
|
|
|
test_globbing.py |
2318.2.3 | 17 years ago | Kent Gibson | merged bzr.dev | 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 |
3099.3.3 | 16 years ago | John Arbash Meinel | Deprecate get_parents() in favor of get_parent_map | 27.8 KB |
|
|
|
test_hashcache.py |
2949.5.2 | 17 years ago | Alexander Belchenko | John's review | 7.1 KB |
|
|
|
test_help.py |
3089.3.5 | 16 years ago | Ian Clatworthy | add test for loading help from a file | 12.6 KB |
|
|
|
test_hooks.py |
2553.1.1 | 17 years ago | Robert Collins | Give Hooks names. | 1.9 KB |
|
|
|
test_http.py |
3134.1.1 | 16 years ago | Vincent Ladeuil | Fix bug #177643 by handling credentials embedded i | 53.9 KB |
|
|
|
test_http_response.py |
3104.3.4 | 16 years ago | Vincent Ladeuil | Add test. * bzrlib/transport/http/_urllib2_wrappe | 25.5 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 |
2375.1.5 | 17 years ago | Andrew Bennetts | Deal with review comments from Robert: * Add my | 2.5 KB |
|
|
|
test_ignores.py |
2318.2.3 | 17 years ago | Kent Gibson | merged bzr.dev | 5.3 KB |
|
|
|
test_index.py |
2890.2.18 | 17 years ago | Robert Collins | Review feedback. | 52.4 KB |
|
|
|
test_info.py |
2996.2.13 | 16 years ago | Aaron Bentley | Merge bzr.dev | 12.9 KB |
|
|
|
test_inv.py |
2729.2.5 | 17 years ago | Martin Pool | Move per-inventory tests from test_inv to tests.in | 6.7 KB |
|
|
|
test_knit.py |
3052.2.6 | 16 years ago | Andrew Bennetts | Fix typo in comment. | 125 KB |
|
|
|
test_lazy_import.py |
1551.18.23 | 17 years ago | Aaron Bentley | Ensure that the attribute is actually set | 43 KB |
|
|
|
test_lazy_regex.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 4.6 KB |
|
|
|
test_lockable_files.py |
3107.2.1 | 16 years ago | John Arbash Meinel | Fix LockableFiles to not use modes that allow the | 15.6 KB |
|
|
|
test_lockdir.py |
3107.2.2 | 16 years ago | John Arbash Meinel | feedback from Martin. | 23.3 KB |
|
|
|
test_log.py |
3063.3.4 | 16 years ago | John Arbash Meinel | [merge] bzr.dev 3079 | 34.5 KB |
|
|
|
test_lru_cache.py |
2998.2.1 | 16 years ago | John Arbash Meinel | Implement LRUCache.get() which acts like dict.get( | 10.5 KB |
|
|
|
test_lsprof.py |
2805.7.5 | 17 years ago | Ian Clatworthy | more win32 path friendliness | 2.7 KB |
|
|
|
test_mail_client.py |
3042.1.2 | 16 years ago | Lukáš Lalinský | Don't use None as address in TestXDGEmail and add | 4.2 KB |
|
|
|
test_memorytree.py |
3010.1.7 | 16 years ago | Robert Collins | Locking in test_memorytree. | 6.5 KB |
|
|
|
test_merge.py |
3062.2.13 | 16 years ago | Aaron Bentley | Update prepare_cherrypick docstring | 18.4 KB |
|
|
|
test_merge3.py |
1551.10.38 | 17 years ago | Aaron Bentley | merge3 auto-detects line endings for conflict mark | 13.5 KB |
|
|
|
test_merge_core.py |
3010.1.8 | 16 years ago | Robert Collins | test_merge_core locking correctness. | 30 KB |
|
|
|
test_merge_directive.py |
1551.19.19 | 16 years ago | Aaron Bentley | Merge directives can now fetch prerequisites from | 25.8 KB |
|
|
|
test_missing.py |
1551.15.70 | 17 years ago | Aaron Bentley | Avoid using builtins.merge | 7.7 KB |
|
|
|
test_msgeditor.py |
3128.1.3 | 16 years ago | Vincent Ladeuil | Since we are there s/parameteris.*/parameteriz&/. | 10.5 KB |
|
|
|
test_multiparent.py |
2520.4.139 | 17 years ago | Aaron Bentley | Support Multiparent.get_matching_blocks | 11 KB |
|
|
|
test_nonascii.py |
2204.3.3 | 17 years ago | Alexander Belchenko | Don't formats unicode strings in test error messag | 6.8 KB |
|
|
|
test_options.py |
2768.1.15 | 17 years ago | Ian Clatworthy | Merge bzr.dev | 17.3 KB |
|
|
|
test_osutils.py |
3089.3.9 | 16 years ago | Ian Clatworthy | add test for resource loading | 41.9 KB |
|
|
|
test_osutils_encodings.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 7.2 KB |
|
|
|
test_pack.py |
2916.2.13 | 17 years ago | Andrew Bennetts | Improve some docstrings. | 26.9 KB |
|
|
|
test_patch.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1 KB |
|
|
|
test_patches.py |
1551.18.6 | 17 years ago | Aaron Bentley | Add support for diff -p-style diffs to patch parse | 7.9 KB |
|
|
|
test_permissions.py |
2485.8.38 | 17 years ago | Vincent Ladeuil | Finish sftp refactoring. Test suite passing. * bz | 10.5 KB |
|
|
|
test_plugins.py |
2967.4.10 | 17 years ago | Daniel Watkins | Fixed message. | 21.6 KB |
|
|
|
test_progress.py |
2599.1.1 | 17 years ago | Martin Pool | Don't show dots progress indicatiors in noninterac | 10.6 KB |
|
|
|
test_read_bundle.py |
2520.4.132 | 17 years ago | Aaron Bentley | Merge from bzr.dev | 3.1 KB |
|
|
|
test_reconcile.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.9 KB |
|
|
|
test_reconfigure.py |
2796.2.26 | 16 years ago | Aaron Bentley | Support converting standalone tree to lightweight | 10.4 KB |
|
|
|
test_registry.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 10.1 KB |
|
|
|
test_remote.py |
2535.3.72 | 17 years ago | Andrew Bennetts | Remove irrelevant test. | 31.2 KB |
|
|
|
test_repository.py |
3070.1.1 | 16 years ago | Robert Collins | * ``bzr pack`` now orders revision texts in topolo | 60.5 KB |
|
|
|
test_revert.py |
1551.19.9 | 16 years ago | Aaron Bentley | Update from review | 6.1 KB |
|
|
|
test_revision.py |
3123.1.1 | 16 years ago | John Arbash Meinel | Update from deprecating 0.93 to 1.0, and add a 1.1 | 14.2 KB |
|
|
|
test_revisionnamespaces.py |
2598.5.13 | 17 years ago | Aaron Bentley | Merge bzr.dev | 18.2 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 |
3128.1.3 | 16 years ago | Vincent Ladeuil | Since we are there s/parameteris.*/parameteriz&/. | 74.4 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 |
2823.1.14 | 17 years ago | Vincent Ladeuil | Fix 141382 by comparing real paths. * bzrlib/test | 16.6 KB |
|
|
|
test_smart.py |
3015.2.12 | 16 years ago | Robert Collins | Make test_smart use specific formats as needed to | 37.8 KB |
|
|
|
test_smart_add.py |
2581.1.1 | 17 years ago | Martin Pool | Merge more runbzr cleanups | 6 KB |
|
|
|
test_smart_transport.py |
2748.4.16 | 17 years ago | Andrew Bennetts | Tweaks suggested by review. | 110 KB |
|
|
|
test_smtp_connection.py |
2900.2.17 | 17 years ago | Vincent Ladeuil | merge bzr.dev | 10 KB |
|
|
|
test_source.py |
2696.1.1 | 17 years ago | Martin Pool | Remove things deprecated in 0.11 and earlier | 9.9 KB |
|
|
|
test_ssh_transport.py |
2989.2.3 | 16 years ago | Alexander Belchenko | fix test_get_vendor_by_inspection_plink | 7.9 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 |
2696.1.1 | 17 years ago | Martin Pool | Remove things deprecated in 0.11 and earlier | 16.6 KB |
|
|
|
test_strace.py |
2566.3.4 | 17 years ago | Vincent Ladeuil | Take Martin and Robert comments into account. * b | 2.6 KB |
|
|
|
test_subsume.py |
2255.2.214 | 17 years ago | Robert Collins | Get _iter_changes on dirstate passing the subtree | 5.1 KB |
|
|
|
test_switch.py |
3078.2.6 | 16 years ago | Ian Clatworthy | fix efficiency of local commit detection as recomm | 5.4 KB |
|
|
|
test_symbol_versioning.py |
2825.3.4 | 17 years ago | Martin Pool | Better explanation of deprecation | 8.8 KB |
|
|
|
test_tag.py |
2866.1.1 | 17 years ago | Alexander Belchenko | merge with bzr.dev | 6.5 KB |
|
|
|
test_testament.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 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 |
2425.6.1 | 17 years ago | Martin Pool | Fix formatting of timezones in bundles and merge d | 2.3 KB |
|
|
|
test_trace.py |
2851.3.1 | 17 years ago | Martin Pool | Add unit test for _rollover_trace_maybe | 6.9 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 |
3144.4.2 | 16 years ago | Aaron Bentley | Handle non-directory parent conflicts (abentley, # | 80.3 KB |
|
|
|
test_transport.py |
3059.2.18 | 16 years ago | Vincent Ladeuil | Take spiv review comments into account. * bzrlib/ | 30.1 KB |
|
|
|
test_transport_implementations.py |
3059.2.18 | 16 years ago | Vincent Ladeuil | Take spiv review comments into account. * bzrlib/ | 63.2 KB |
|
|
|
test_tree.py |
2655.2.2 | 17 years ago | Marius Kruger | Rather use assertRaises in test_changes_from_with_ | 5.6 KB |
|
|
|
test_treebuilder.py |
2466.7.1 | 17 years ago | Robert Collins | Tree builder tests do not need a working dir. | 3.2 KB |
|
|
|
test_tsort.py |
2490.2.31 | 17 years ago | Aaron Bentley | Fix iter_topo_order to permit un-included parents | 14.9 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 |
2363.4.10 | 17 years ago | Vincent Ladeuil | Complete tests. * bzrlib/transport/http/_urllib.p | 9.5 KB |
|
|
|
test_upgrade.py |
3015.2.18 | 16 years ago | Robert Collins | Lock correctness for test_upgrade.py. | 22.2 KB |
|
|
|
test_urlutils.py |
2512.4.1 | 17 years ago | Ian Clatworthy | Fixes #115491 - 'branch lp:projname' now creates . | 25.6 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 |
3138.1.1 | 16 years ago | John Arbash Meinel | Fix bug #175886: version_info deprecated functions | 12 KB |
|
|
|
test_versionedfile.py |
3062.1.14 | 16 years ago | Aaron Bentley | Use topo_sorted=False with get_ancestry | 48.3 KB |
|
|
|
test_weave.py |
2825.4.1 | 17 years ago | Robert Collins | * ``pull``, ``merge`` and ``push`` will no longer | 26.8 KB |
|
|
|
test_whitebox.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 2.7 KB |
|
|
|
test_win32utils.py |
2681.4.4 | 17 years ago | Alexander Belchenko | test use Feature instead of TestSkipped | 5.1 KB |
|
|
|
test_workingtree.py |
3140.1.4 | 16 years ago | Aaron Bentley | Add WorkingTree.find_trees | 14.9 KB |
|
|
|
test_workingtree_4.py |
2825.6.1 | 17 years ago | Robert Collins | * ``WorkingTree.rename_one`` will now raise an err | 24.1 KB |
|
|
|
test_wsgi.py |
2432.3.5 | 17 years ago | Andrew Bennetts | Merge Robert's status prefix changes to protocol 2 | 10.6 KB |
|
|
|
test_xml.py |
2917.2.1 | 17 years ago | John Arbash Meinel | Fix bug #152360. The xml5 serializer should be usi | 20.4 KB |
|
|
|
TestUtil.py |
2921.6.13 | 16 years ago | Robert Collins | * Modules can now customise their tests by definin | 5 KB |
|
|
|
transport_util.py |
2817.4.5 | 17 years ago | Vincent Ladeuil | Merge bzr.dev | 5.2 KB |
|
|
|
treeshape.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.6 KB |
|
|