- Committer: Canonical.com Patch Queue Manager
- Date: 2007-07-21 16:36:03 UTC
- mfrom: (2644.1.2 bug-127115)
- Revision ID: pqm@pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
Fix bug #127115 by checking for self.other_rev_id being None in Merger.set_pending()
| 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 |
|
||
|
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 |
2474.1.73 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2641 | 95.8 KB |
|
|
|
EncodingAdapter.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.1 KB |
|
|
|
HttpServer.py |
2420.1.13 | 17 years ago | Vincent Ladeuil | Merge bzr.dev | 15.5 KB |
|
|
|
HTTPTestUtil.py |
2574.1.1 | 17 years ago | Ian Clatworthy | (Vincent Ladeuil) Fix #115209 - Unable to handle h | 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 |
2598.5.3 | 17 years ago | Aaron Bentley | Push NULL_REVISION deeper | 2.2 KB |
|
|
|
test_annotate.py |
2593.1.5 | 17 years ago | Adeodato Simó | Fix copy&paste bug in test, catched by John. | 12.4 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 |
2568.2.7 | 17 years ago | Robert Collins | Fix missed tests. | 3 KB |
|
|
|
test_branch.py |
1551.15.35 | 17 years ago | Aaron Bentley | Warn when setting config values that will be maske | 14.1 KB |
|
|
|
test_branchbuilder.py |
2466.7.10 | 17 years ago | Robert Collins | Add a format parameter to BranchBuilder. | 2.9 KB |
|
|
|
test_bugtracker.py |
2376.4.42 | 17 years ago | Jonathan Lange | Parametrize URLParametrizedIntegerBugTracker even | 7.9 KB |
|
|
|
test_bundle.py |
2520.4.136 | 17 years ago | Aaron Bentley | Fix format strings | 60.7 KB |
|
|
|
test_bzrdir.py |
2018.5.138 | 17 years ago | Robert Collins | Merge bzr.dev. | 35.9 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 |
2484.1.25 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2612 | 26.5 KB |
|
|
|
test_commit_merge.py |
2353.5.1 | 17 years ago | Alexander Belchenko | forgotten import of TestSkipped | 4.5 KB |
|
|
|
test_config.py |
1551.15.35 | 17 years ago | Aaron Bentley | Warn when setting config values that will be maske | 41.3 KB |
|
|
|
test_conflicts.py |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 4.9 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 |
2405.1.3 | 17 years ago | John Arbash Meinel | Do a better fix, which recognizes that we should p | 30.7 KB |
|
|
|
test_dirstate.py |
2474.1.62 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2601 | 88.4 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 |
2634.1.1 | 17 years ago | Robert Collins | (robertc) Reinstate the accidentally backed out ex | 16.1 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 |
2323.8.2 | 17 years ago | Aaron Bentley | Give a nicer error on fetch when repos are in inco | 13.6 KB |
|
|
|
test_file_names.py |
2617.4.4 | 17 years ago | Robert Collins | Rename to FileNames as per review. | 3.3 KB |
|
|
|
test_ftp_transport.py |
2413.1.2 | 17 years ago | John Arbash Meinel | Clean up test ordering | 2.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 |
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 |
2520.4.104 | 17 years ago | Aaron Bentley | Avoid infinite loop when there is no unique lca | 10.2 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_help.py |
2598.1.4 | 17 years ago | Martin Pool | Fix up tests for option help cleanups | 9.4 KB |
|
|
|
test_hooks.py |
2553.1.1 | 17 years ago | Robert Collins | Give Hooks names. | 1.9 KB |
|
|
|
test_http.py |
2574.1.1 | 17 years ago | Ian Clatworthy | (Vincent Ladeuil) Fix #115209 - Unable to handle h | 49.8 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 |
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 |
2592.1.46 | 17 years ago | Robert Collins | Make GraphIndex accept nodes as key, value, refere | 21 KB |
|
|
|
test_info.py |
1551.15.43 | 17 years ago | Aaron Bentley | Provide ways of getting at unicode-clean output | 12.3 KB |
|
|
|
test_inv.py |
1551.13.13 | 17 years ago | Aaron Bentley | Fail if BzrError not raised | 14.2 KB |
|
|
|
test_knit.py |
2520.4.132 | 17 years ago | Aaron Bentley | Merge from bzr.dev | 59 KB |
|
|
|
test_lazy_import.py |
2399.1.15 | 17 years ago | John Arbash Meinel | [merge] api-doc-builder and remove the pydoctor bu | 41.7 KB |
|
|
|
test_lazy_regex.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 4.6 KB |
|
|
|
test_lockable_files.py |
2018.5.171 | 17 years ago | Andrew Bennetts | Disconnect RemoteTransports in some tests to avoid | 15.2 KB |
|
|
|
test_lockdir.py |
2555.3.21 | 17 years ago | Martin Pool | Remove LockDir.wait() | 23.3 KB |
|
|
|
test_log.py |
2581.1.6 | 17 years ago | Martin Pool | fix up more run_bzr callers | 27.3 KB |
|
|
|
test_lsprof.py |
1551.15.28 | 17 years ago | Aaron Bentley | Improve Feature usage style w/ lsprof | 2.5 KB |
|
|
|
test_memorytree.py |
1731.1.64 | 18 years ago | Aaron Bentley | Fix up more memorytree tests | 6.2 KB |
|
|
|
test_merge.py |
2644.1.2 | 17 years ago | Wouter van Heyst | As Aaron explained #127115 is more general, failin | 11.7 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 |
1551.15.46 | 17 years ago | Aaron Bentley | Move plan merge to tree | 27.3 KB |
|
|
|
test_merge_directive.py |
2639.1.1 | 17 years ago | John Arbash Meinel | (Adeodato Simó) EmailMessage class, allowing much | 23.3 KB |
|
|
|
test_missing.py |
2490.1.3 | 17 years ago | John Arbash Meinel | Restore the test for iter_log_data as a deprecated | 7.8 KB |
|
|
|
test_msgeditor.py |
2472.4.2 | 17 years ago | Alexander Belchenko | unwrapping long lines in tests | 7.5 KB |
|
|
|
test_multiparent.py |
2520.4.103 | 17 years ago | Aaron Bentley | Add MultiParent.to_lines | 10.3 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 |
2598.1.14 | 17 years ago | Martin Pool | Revert tightening of options api - breaks too many | 12.9 KB |
|
|
|
test_osutils.py |
2568.1.1 | 17 years ago | John Arbash Meinel | (Elliot Murphy) Use os.lstat rather than os.stat f | 37.5 KB |
|
|
|
test_osutils_encodings.py |
2192.1.10 | 17 years ago | Alexander Belchenko | merge bzr.dev | 7.2 KB |
|
|
|
test_pack.py |
2506.2.10 | 17 years ago | Andrew Bennetts | Add '(introduced in 0.18)' to pack format string. | 14.5 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 |
2610.2.1 | 17 years ago | Martin Pool | (Lukas Lalinsky) don't create a duplicate zipimpor | 14.3 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_registry.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 10.1 KB |
|
|
|
test_remote.py |
2477.1.13 | 17 years ago | Martin Pool | merge hpss compatibility fix | 29.6 KB |
|
|
|
test_repository.py |
2363.5.14 | 17 years ago | Aaron Bentley | Prevent repository.get_set_default_format from cor | 20.6 KB |
|
|
|
test_revert.py |
2499.1.1 | 17 years ago | Aaron Bentley | Revert does not try to preserve file contents prod | 5.1 KB |
|
|
|
test_revision.py |
2490.2.21 | 17 years ago | Aaron Bentley | Rename graph to deprecated_graph | 13.1 KB |
|
|
|
test_revisionnamespaces.py |
2340.1.1 | 17 years ago | John Arbash Meinel | (Marien Zwart) RevisionSpec.from_string() should s | 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 |
2598.4.1 | 17 years ago | Martin Pool | Remove obsolete --clean-output, --keep-output, --n | 64.3 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 |
2631.1.1 | 17 years ago | Aaron Bentley | Disable timing-sensitive test | 18.5 KB |
|
|
|
test_smart.py |
2018.18.25 | 17 years ago | Martin Pool | Repository.tarball fixes for python2.4 Use 'r|bz2 | 35.4 KB |
|
|
|
test_smart_add.py |
2581.1.1 | 17 years ago | Martin Pool | Merge more runbzr cleanups | 6 KB |
|
|
|
test_smart_transport.py |
2634.1.1 | 17 years ago | Robert Collins | (robertc) Reinstate the accidentally backed out ex | 95.4 KB |
|
|
|
test_smtp_connection.py |
2625.6.1 | 17 years ago | Adeodato Simó | New EmailMessage class, façade around email.Messag | 3.9 KB |
|
|
|
test_source.py |
2613.1.2 | 17 years ago | Martin Pool | Move bencode tests into util.tests | 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_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_symbol_versioning.py |
2227.1.2 | 17 years ago | mbp at sourcefrog | Add a simple DeprecatedDict class | 7.9 KB |
|
|
|
test_tag.py |
1551.13.1 | 17 years ago | Aaron Bentley | Introduce dirstate-tags format | 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 |
2425.6.1 | 17 years ago | Martin Pool | Fix formatting of timezones in bundles and merge d | 2.3 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 |
2625.4.3 | 17 years ago | Ian Clatworthy | Add a test to ensure the deprecation worked. | 62.1 KB |
|
|
|
test_transport.py |
2052.6.3 | 17 years ago | Robert Collins | Merge bzr.dev. | 23.7 KB |
|
|
|
test_transport_implementations.py |
2634.1.1 | 17 years ago | Robert Collins | (robertc) Reinstate the accidentally backed out ex | 56.7 KB |
|
|
|
test_tree.py |
2255.7.90 | 17 years ago | Robert Collins | Add unversioned path reporting to TreeDelta. | 4.8 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 |
2255.2.196 | 17 years ago | Robert Collins | Fix test_upgrade defects related to non local or a | 22 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 |
1731.1.51 | 18 years ago | Aaron Bentley | Merge bzr.dev | 8.8 KB |
|
|
|
test_versionedfile.py |
2520.4.89 | 17 years ago | Aaron Bentley | Add get_sha1s to weaves | 49.5 KB |
|
|
|
test_weave.py |
2624.1.1 | 17 years ago | Adeodato Simó | Loose python2.4-specific shebangs; use generic pyt | 27.7 KB |
|
|
|
test_whitebox.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 2.7 KB |
|
|
|
test_workingtree.py |
2292.1.20 | 17 years ago | Marius Kruger | move test_workingtree.TestRemove to workingtree_im | 13.6 KB |
|
|
|
test_workingtree_4.py |
2466.4.2 | 17 years ago | John Arbash Meinel | Clean up the (failing) test so that the last thing | 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 |
2520.4.101 | 17 years ago | Aaron Bentley | Use a registry to look up xml serializers by forma | 18.8 KB |
|
|
|
TestUtil.py |
1739.1.8 | 17 years ago | Robert Collins | Review feedback. | 3.7 KB |
|
|
|
treeshape.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.6 KB |
|
|