- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
2999.1.2 | 16 years ago | Ian Clatworthy | incorporate review feedback including basic blackb | 6.4 KB |
|
|
|
test_add.py |
2664.3.1 | 17 years ago | Daniel Watkins | tests.blackbox.test_add now uses internals where a | 8.4 KB |
|
|
|
test_added.py |
2664.6.1 | 17 years ago | Daniel Watkins | tests.blackbox.test_added now uses internals where | 1.7 KB |
|
|
|
test_aliases.py |
2664.6.2 | 17 years ago | Daniel Watkins | tests.blackbox.test_aliases now uses internals whe | 2.5 KB |
|
|
|
test_ancestry.py |
2664.6.3 | 17 years ago | Daniel Watkins | tests.blackbox.test_ancestry now uses internals wh | 4.3 KB |
|
|
|
test_annotate.py |
2745.3.2 | 17 years ago | Daniel Watkins | Updated tests to reflect new error text. | 5.9 KB |
|
|
|
test_bound_branches.py |
3099.1.1 | 16 years ago | John Arbash Meinel | Fix bug #175337, bzr bind shouldn't check the ance | 13.2 KB |
|
|
|
test_branch.py |
2664.8.2 | 17 years ago | Daniel Watkins | tests.blackbox.test_branch now uses internals wher | 4.2 KB |
|
|
|
test_break_lock.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4 KB |
|
|
|
test_breakin.py |
2485.8.48 | 17 years ago | Vincent Ladeuil | merge bzr.dev @ 2540 | 3.4 KB |
|
|
|
test_bundle_info.py |
1551.18.5 | 17 years ago | Aaron Bentley | Add test cases for bzr bundle-info | 2 KB |
|
|
|
test_cat.py |
3063.4.2 | 16 years ago | John Arbash Meinel | Fix 'nonexistent' | 4.9 KB |
|
|
|
test_cat_revision.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 2.1 KB |
|
|
|
test_check.py |
2929.2.3 | 17 years ago | Robert Collins | Review feedback. | 1.1 KB |
|
|
|
test_checkout.py |
3123.5.3 | 16 years ago | Aaron Bentley | Get tests passing with accelerator_tree | 5.7 KB |
|
|
|
test_command_encoding.py |
2830.2.3 | 17 years ago | Martin Pool | Fix up test_command_encoding to expect to see the | 3.8 KB |
|
|
|
test_commit.py |
3099.2.1 | 16 years ago | John Arbash Meinel | Allow 'bzr commit --author' to take a unicode stri | 24 KB |
|
|
|
test_conflicts.py |
2738.4.5 | 17 years ago | Daniel Watkins | Fixed whitespace issues. | 4.2 KB |
|
|
|
test_debug.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 1.6 KB |
|
|
|
test_diff.py |
3072.1.3 | 16 years ago | Ian Clatworthy | Test more --old and --new combinations | 14.7 KB |
|
|
|
test_exceptions.py |
3092.2.1 | 16 years ago | Martin Pool | Ask people to report bugs to Launchpad, and mentio | 2.8 KB |
|
|
|
test_export.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 8.7 KB |
|
|
|
test_find_merge_base.py |
2664.5.2 | 17 years ago | Aaron Bentley | Fix up imports | 1.5 KB |
|
|
|
test_help.py |
2743.2.6 | 17 years ago | Daniel Watkins | Cleaned up indentation in test. | 5.5 KB |
|
|
|
test_ignore.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 5.6 KB |
|
|
|
test_ignored.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.6 KB |
|
|
|
test_info.py |
3113.5.1 | 16 years ago | Alexander Belchenko | XFAIL test for #174055: can't run bzr info while d | 41.6 KB |
|
|
|
test_init.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 6.7 KB |
|
|
|
test_inventory.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4.3 KB |
|
|
|
test_join.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.9 KB |
|
|
|
test_locale.py |
2768.1.8 | 17 years ago | Ian Clatworthy | Get test suite fully working again | 2.9 KB |
|
|
|
test_log.py |
3108.1.3 | 16 years ago | Matt Nordhoff | Use assertContainsRe/assertNotContainsRe in tests. | 17.1 KB |
|
|
|
test_logformats.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.4 KB |
|
|
|
test_ls.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 8.1 KB |
|
|
|
test_lsprof.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.2 KB |
|
|
|
test_merge.py |
3133 | 16 years ago | Canonical.com Patch Queue Manager | Annotate merge can do cherrypicks (abentley) | 17.9 KB |
|
|
|
test_merge_directive.py |
2898.2.3 | 17 years ago | James Henstridge | * Fix merge-directive blackbox test. * Fix small t | 10.1 KB |
|
|
|
test_missing.py |
2664.14.2 | 17 years ago | Daniel Watkins | Fixed tests.blackbox.test_missing to use internals | 5.2 KB |
|
|
|
test_mv.py |
2978.8.5 | 16 years ago | Alexander Belchenko | merge bzr.dev | 13.4 KB |
|
|
|
test_nick.py |
2664.11.1 | 17 years ago | Daniel Watkins | tests.blackbox.test_nick now uses internals where | 1.5 KB |
|
|
|
test_non_ascii.py |
3123.2.1 | 16 years ago | Lukáš Lalinský | Use self.outf instead of sys.stdout in cmd_ignored | 19.6 KB |
|
|
|
test_outside_wt.py |
3072.1.5 | 16 years ago | Ian Clatworthy | more good ideas from abentley | 2.7 KB |
|
|
|
test_pack.py |
2604.2.1 | 17 years ago | Robert Collins | (robertc) Introduce a pack command. | 1.5 KB |
|
|
|
test_pull.py |
2738.2.6 | 17 years ago | Daniel Watkins | Now use internal merging. | 11.4 KB |
|
|
|
test_push.py |
3066.3.3 | 16 years ago | jml at canonical | Unregister the test transport in order to be clean | 12.5 KB |
|
|
|
test_re_sign.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3 KB |
|
|
|
test_reconcile.py |
3010.1.14 | 16 years ago | Robert Collins | Handle packs in blackbox.test_reconcile. | 3 KB |
|
|
|
test_reconfigure.py |
2796.2.22 | 16 years ago | Aaron Bentley | Tweak from review | 2.6 KB |
|
|
|
test_remerge.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4.5 KB |
|
|
|
test_remove.py |
3042.2.1 | 16 years ago | Lukáš Lalinský | Fix ``bzr rm`` to not delete modified and ignored | 7.8 KB |
|
|
|
test_remove_tree.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.9 KB |
|
|
|
test_revert.py |
2851.2.1 | 17 years ago | Martin Pool | Add revert --forget-merges | 7.2 KB |
|
|
|
test_revision_history.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 2.9 KB |
|
|
|
test_revision_info.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 3.3 KB |
|
|
|
test_revno.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.5 KB |
|
|
|
test_selftest.py |
2830.2.5 | 17 years ago | Martin Pool | Deprecated ``run_bzr_decode``; use the new ``outpu | 23.2 KB |
|
|
|
test_send.py |
3060.2.1 | 16 years ago | Lukáš Lalinský | Fix misplaced branch lock in cmd_send. The branch | 10.4 KB |
|
|
|
test_serve.py |
2598.5.4 | 17 years ago | Aaron Bentley | Restore original Branch.last_revision behavior, fi | 9.1 KB |
|
|
|
test_shared_repository.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.7 KB |
|
|
|
test_sign_my_commits.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.8 KB |
|
|
|
test_split.py |
3113.6.5 | 16 years ago | Aaron Bentley | Update tests | 2.6 KB |
|
|
|
test_status.py |
2792.1.1 | 17 years ago | Ian Clatworthy | Add short options to status to assist migrating sv | 16 KB |
|
|
|
test_switch.py |
2999.1.4 | 16 years ago | Ian Clatworthy | more review tweaks including commit of blackbox te | 1.9 KB |
|
|
|
test_tags.py |
2805.8.6 | 17 years ago | Adeodato Simó | Don't sort by revno; only by time if --sort=time i | 7.9 KB |
|
|
|
test_testament.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.7 KB |
|
|
|
test_too_much.py |
2823.1.6 | 17 years ago | Vincent Ladeuil | Redo minor fix. * bzrlib/tests/blackbox/test_too_ | 23 KB |
|
|
|
test_uncommit.py |
3101.1.2 | 16 years ago | Aaron Bentley | Improve uncommit test | 7.9 KB |
|
|
|
test_unknowns.py |
2795.2.2 | 17 years ago | Daniel Watkins | Added tests.blackbox.test_unknowns. | 1.6 KB |
|
|
|
test_update.py |
2949.5.1 | 17 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 8.6 KB |
|
|
|
test_upgrade.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 7.8 KB |
|
|
|
test_version.py |
2785.1.5 | 17 years ago | Alexander Belchenko | support for non-ascii BZR_HOME in show_version() | 2.7 KB |
|
|
|
test_version_info.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4.8 KB |
|
|
|
test_versioning.py |
3010.1.16 | 16 years ago | Robert Collins | Lock correctness in test_versioning | 5.6 KB |
|
|
|
test_whoami.py |
2900.2.24 | 17 years ago | Vincent Ladeuil | Review feedback. * doc/en/user-guide/authenticati | 4.6 KB |
|
|