To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-01-31 14:04:56 UTC
- mfrom: (1551.10.2 Aaron's mergeable stuff)
- Revision ID: pqm@pqm.ubuntu.com-20070131140456-56881c31a01089a3
Handle merge with dangling inventory entries
| 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 | 19 years ago | Robert Collins | Move branch implementations tests into a package. |
|
||
|
bzrdir_implementations
|
1534.4.39 | 19 years ago | Robert Collins | Basic BzrDir support. |
|
||
|
interrepository_implementations
|
1534.1.29 | 19 years ago | Robert Collins | Add a test environment for InterRepository objects |
|
||
|
intertree_implementations
|
1852.8.3 | 19 years ago | Robert Collins | Implement an InterTreeTestProvider and a trivial t |
|
||
|
interversionedfile_implementations
|
1563.2.12 | 19 years ago | Robert Collins | Checkpointing: created InterObject to factor out c |
|
||
|
repository_implementations
|
1534.4.40 | 19 years ago | Robert Collins | Add RepositoryFormats and allow bzrdir.open or cre |
|
||
|
revisionstore_implementations
|
1563.2.21 | 19 years ago | Robert Collins | Smoke test for RevisionStore factories creating re |
|
||
|
test_patches_data
|
1731.1.17 | 19 years ago | Aaron Bentley | Merge bzr.dev |
|
||
|
tree_implementations
|
1852.6.1 | 19 years ago | Robert Collins | Start tree implementation tests. |
|
||
|
workingtree_implementations
|
1534.4.46 | 19 years ago | Robert Collins | Nearly complete .bzr/checkout splitout. |
|
||
__init__.py |
2245.1.2 | 18 years ago | Robert Collins | Remove the static DefaultHooks method from Branch, | 72.9 KB |
|
|
|
EncodingAdapter.py |
2052.3.2 | 19 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 | 19 years ago | John Arbash Meinel | Renaming LockHelpers.py to lock_helpers.py | 2.8 KB |
|
|
|
stub_sftp.py |
1963.2.7 | 19 years ago | Robey Pointer | merge from bzr.dev | 7.8 KB |
|
|
|
test_ancestry.py |
2052.3.6 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 2.2 KB |
|
|
|
test_annotate.py |
1551.9.19 | 18 years ago | Aaron Bentley | Merge from bzr.dev | 9.2 KB |
|
|
|
test_api.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.3 KB |
|
|
|
test_atomicfile.py |
1982.1.1 | 19 years ago | Alexander Belchenko | Explicitly skip tests with file attribute manipula | 4.6 KB |
|
|
|
test_bad_files.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3 KB |
|
|
|
test_branch.py |
2245.1.3 | 18 years ago | Robert Collins | Add install_hook to the BranchHooks class as the o | 7.3 KB |
|
|
|
test_bundle.py |
2067.3.3 | 19 years ago | Martin Pool | merge bzr.dev and reconcile several changes, also | 38.4 KB |
|
|
|
test_bzrdir.py |
2215.3.7 | 18 years ago | Aaron Bentley | Remove (new) trailing whitespace | 29.2 KB |
|
|
|
test_cache_utf8.py |
1911.2.5 | 19 years ago | John Arbash Meinel | Update cache tests, add a function to do something | 3 KB |
|
|
|
test_commands.py |
2155.2.3 | 18 years ago | Marius Kruger | * commands.py - fixed spelling mistake: usefull | 3.5 KB |
|
|
|
test_commit.py |
2149.1.4 | 18 years ago | Aaron Bentley | Add additional test that callback is called with a | 23.6 KB |
|
|
|
test_commit_merge.py |
2052.3.6 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 3.8 KB |
|
|
|
test_config.py |
2167.1.1 | 18 years ago | John Arbash Meinel | (James Henstridge) Add support for per-entry confi | 39 KB |
|
|
|
test_conflicts.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 4 KB |
|
|
|
test_decorators.py |
2230.2.4 | 18 years ago | John Arbash Meinel | Add tests that decorators generate useful wrappers | 6.7 KB |
|
|
|
test_diff.py |
2138.1.1 | 18 years ago | Wouter van Heyst | Robuster external diff output handling. | 26.9 KB |
|
|
|
test_doc_generate.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.2 KB |
|
|
|
test_errors.py |
2245.1.3 | 18 years ago | Robert Collins | Add install_hook to the BranchHooks class as the o | 10.3 KB |
|
|
|
test_escaped_store.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 4.3 KB |
|
|
|
test_fetch.py |
2004.1.41 | 18 years ago | v.ladeuil+lp at free | Merge bzr.dev | 12.8 KB |
|
|
|
test_ftp_transport.py |
2052.3.1 | 19 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 | 18 years ago | جاون عرباش ماينل | Allow tests to skip after installation, since cert | 1.7 KB |
|
|
|
test_generate_ids.py |
2116.4.1 | 19 years ago | John Arbash Meinel | Update file and revision id generators. Move id ge | 5.7 KB |
|
|
|
test_globbing.py |
2135.2.8 | 18 years ago | Kent Gibson | Add helper method to simplify test_char_group case | 9.8 KB |
|
|
|
test_gpg.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.2 KB |
|
|
|
test_graph.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.9 KB |
|
|
|
test_hashcache.py |
2012.1.7 | 19 years ago | Aaron Bentley | Get tree._iter_changed down to ~ 1 stat per file | 7.2 KB |
|
|
|
test_http.py |
2188.1.1 | 18 years ago | Aaron Bentley | Windows tests cleanup. (Vincent Ladeuil) | 28 KB |
|
|
|
test_http_response.py |
2052.3.6 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 24.4 KB |
|
|
|
test_identitymap.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.7 KB |
|
|
|
test_ignores.py |
2104.1.2 | 19 years ago | John Arbash Meinel | (Kent Gibson) Fix bug #4559, strip trailing slashe | 5.2 KB |
|
|
|
test_inv.py |
1551.9.29 | 18 years ago | Aaron Bentley | Optimize Tree._iter_changes with specific file_ids | 25.5 KB |
|
|
|
test_knit.py |
2196.2.5 | 18 years ago | John Arbash Meinel | Add an exception class when the knit index storage | 44.9 KB |
|
|
|
test_lazy_import.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 39.1 KB |
|
|
|
test_lazy_regex.py |
2052.3.4 | 19 years ago | John Arbash Meinel | [merge] bzr.dev | 4.6 KB |
|
|
|
test_lockable_files.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 6.8 KB |
|
|
|
test_lockdir.py |
2055.2.1 | 19 years ago | John Arbash Meinel | Make LockDir less sensitive to invalid configurati | 21.6 KB |
|
|
|
test_log.py |
2120.4.1 | 19 years ago | James Westby | Delete duplicate test_cur_revno test. | 14.9 KB |
|
|
|
test_memorytree.py |
1731.1.64 | 19 years ago | Aaron Bentley | Fix up more memorytree tests | 6.2 KB |
|
|
|
test_merge.py |
1551.10.2 | 18 years ago | Aaron Bentley | Handle merge with dangling inventory entries | 7.5 KB |
|
|
|
test_merge3.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 12.6 KB |
|
|
|
test_merge_core.py |
2116.4.1 | 19 years ago | John Arbash Meinel | Update file and revision id generators. Move id ge | 26.9 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 |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.7 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 |
2221.4.9 | 18 years ago | Aaron Bentley | Zap trailing whitespace | 9.6 KB |
|
|
|
test_osutils.py |
2192.1.10 | 18 years ago | Alexander Belchenko | merge bzr.dev | 24.2 KB |
|
|
|
test_osutils_encodings.py |
2192.1.10 | 18 years ago | Alexander Belchenko | merge bzr.dev | 7.2 KB |
|
|
|
test_patch.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1 KB |
|
|
|
test_patches.py |
2052.3.3 | 19 years ago | John Arbash Meinel | Add (c) Canonical to files that Aaron has approved | 6.9 KB |
|
|
|
test_permissions.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 10.5 KB |
|
|
|
test_plugins.py |
2215.4.1 | 18 years ago | Alexander Belchenko | Bugfix #68124: Allow plugins import from zip archi | 8.7 KB |
|
|
|
test_progress.py |
2052.3.2 | 19 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 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.9 KB |
|
|
|
test_registry.py |
2052.3.6 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 10.1 KB |
|
|
|
test_repository.py |
2241.1.1 | 18 years ago | Martin Pool | Change RepositoryFormat to use a Registry rather t | 19.7 KB |
|
|
|
test_revert.py |
1551.9.10 | 18 years ago | Aaron Bentley | Fix bugs in execute bit handling by revert | 4.6 KB |
|
|
|
test_revision.py |
2229.2.3 | 18 years ago | Aaron Bentley | change reserved_id to is_reserved_id, add check_no | 13 KB |
|
|
|
test_revisionnamespaces.py |
2084 | 19 years ago | Canonical.com Patch Queue Manager | (Robert Collins) Output dotted decimal revision nu | 16.4 KB |
|
|
|
test_revisiontree.py |
1731.1.59 | 19 years ago | Aaron Bentley | Ensure the null revision has no root | 2.3 KB |
|
|
|
test_rio.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 10.1 KB |
|
|
|
test_sampler.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.3 KB |
|
|
|
test_selftest.py |
2245.1.2 | 18 years ago | Robert Collins | Remove the static DefaultHooks method from Branch, | 43.6 KB |
|
|
|
test_setup.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.3 KB |
|
|
|
test_sftp_transport.py |
2216 | 18 years ago | Canonical.com Patch Queue Manager | (Vincent Ladeuil) Fix proxy issues with earlier py | 18.1 KB |
|
|
|
test_smart_add.py |
1731.1.48 | 19 years ago | Aaron Bentley | Merge from 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 | 18 years ago | Wouter van Heyst | (John Arbash Meinel) Fix selftest for installed bz | 10.2 KB |
|
|
|
test_status.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.1 KB |
|
|
|
test_store.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 16.9 KB |
|
|
|
test_symbol_versioning.py |
2227.1.2 | 18 years ago | mbp at sourcefrog | Add a simple DeprecatedDict class | 7.9 KB |
|
|
|
test_testament.py |
2052.3.6 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 14.6 KB |
|
|
|
test_textfile.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.7 KB |
|
|
|
test_textmerge.py |
1185.81.31 | 19 years ago | Aaron Bentley | Use patience for two-way merge | 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 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 12.1 KB |
|
|
|
test_transform.py |
2116.4.1 | 19 years ago | John Arbash Meinel | Update file and revision id generators. Move id ge | 44.5 KB |
|
|
|
test_transport.py |
2156.2.1 | 18 years ago | v.ladeuil+lp at free | Make the tests windows compatible. * bzrlib/tests | 21.3 KB |
|
|
|
test_transport_implementations.py |
2000.3.9 | 18 years ago | v.ladeuil+lp at free | The tests that would have help avoid bug #73948 an | 51.8 KB |
|
|
|
test_tree.py |
2052.3.6 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 4.7 KB |
|
|
|
test_treebuilder.py |
1986.1.9 | 19 years ago | Robert Collins | Update to the TreeBuilder tests. | 3.2 KB |
|
|
|
test_tsort.py |
2084 | 19 years ago | Canonical.com Patch Queue Manager | (Robert Collins) Output dotted decimal revision nu | 14.7 KB |
|
|
|
test_tuned_gzip.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.9 KB |
|
|
|
test_ui.py |
2067.3.3 | 19 years ago | Martin Pool | merge bzr.dev and reconcile several changes, also | 8.2 KB |
|
|
|
test_upgrade.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 17.7 KB |
|
|
|
test_urlutils.py |
2162.2.6 | 18 years ago | Alexander Belchenko | Change tests for win32 UNC path to new file://HOST | 22.8 KB |
|
|
|
test_version.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.5 KB |
|
|
|
test_version_info.py |
1731.1.51 | 19 years ago | Aaron Bentley | Merge bzr.dev | 8.8 KB |
|
|
|
test_versionedfile.py |
2229.2.1 | 18 years ago | Aaron Bentley | Reject reserved ids in versiondfile, tree, branch | 47.8 KB |
|
|
|
test_weave.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 27.7 KB |
|
|
|
test_whitebox.py |
2052.3.4 | 19 years ago | John Arbash Meinel | [merge] bzr.dev | 2.7 KB |
|
|
|
test_workingtree.py |
2135.2.1 | 18 years ago | Kent Gibson | Added glob module to replace broken fnmatch based | 11.9 KB |
|
|
|
test_wsgi.py |
2018.4.11 | 19 years ago | Andrew Bennetts | Use ChrootTransportDecorator so that the WSGI serv | 9.8 KB |
|
|
|
test_xml.py |
2102.4.1 | 18 years ago | John Arbash Meinel | Switch to using millisecond resolution in Revision | 10.7 KB |
|
|
|
TestUtil.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 3.6 KB |
|
|
|
treeshape.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.6 KB |
|
|