- Committer: Aaron Bentley
- Date: 2007-07-23 14:27:42 UTC
- mto: (1551.19.24 Aaron's mergeable stuff)
- Revision ID: abentley@panoramicfeedback.com-20070723142742-98ye8w4au9bjg5q0
Status honours selected paths for conflicts (#127606)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
2520.4.132 | 17 years ago | Aaron Bentley | Merge from bzr.dev | 6.1 KB |
|
|
|
test_add.py |
2581.1.2 | 17 years ago | Martin Pool | Remove unnecessary retcode=0 to run_bzr calls | 7.7 KB |
|
|
|
test_added.py |
2552.2.5 | 17 years ago | Vincent Ladeuil | Revert the intrusive run_bzr('commit') rewritings. | 1.7 KB |
|
|
|
test_aliases.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 2.5 KB |
|
|
|
test_ancestry.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 3.8 KB |
|
|
|
test_annotate.py |
2581.1.1 | 17 years ago | Martin Pool | Merge more runbzr cleanups | 5.9 KB |
|
|
|
test_bound_branches.py |
2552.2.5 | 17 years ago | Vincent Ladeuil | Revert the intrusive run_bzr('commit') rewritings. | 12.4 KB |
|
|
|
test_branch.py |
2485.8.62 | 17 years ago | Vincent Ladeuil | From review comments, fix typos and deprecate some | 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_cat.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 4.3 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_checkout.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 4 KB |
|
|
|
test_command_encoding.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 3.7 KB |
|
|
|
test_commit.py |
2484.1.25 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2612 | 19.2 KB |
|
|
|
test_conflicts.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 4.2 KB |
|
|
|
test_debug.py |
2581.1.5 | 17 years ago | Martin Pool | merge trunk and fix run_bzr call in merge_directiv | 1.6 KB |
|
|
|
test_diff.py |
2581.1.2 | 17 years ago | Martin Pool | Remove unnecessary retcode=0 to run_bzr calls | 11.8 KB |
|
|
|
test_exceptions.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 2 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 |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 1.5 KB |
|
|
|
test_help.py |
2598.1.4 | 17 years ago | Martin Pool | Fix up tests for option help cleanups | 4.7 KB |
|
|
|
test_ignore.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 4.3 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 |
1551.15.41 | 17 years ago | Aaron Bentley | Make info provide more related brances, and format | 40.8 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 |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.9 KB |
|
|
|
test_log.py |
2627.1.1 | 17 years ago | Ian Clatworthy | Merge Kent's work for left alignment of log output | 18 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 |
2520.4.132 | 17 years ago | Aaron Bentley | Merge from bzr.dev | 13.6 KB |
|
|
|
test_merge_directive.py |
2639.1.1 | 17 years ago | John Arbash Meinel | (Adeodato Simó) EmailMessage class, allowing much | 9.9 KB |
|
|
|
test_missing.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 5.1 KB |
|
|
|
test_mv.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 12.8 KB |
|
|
|
test_nick.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 1.5 KB |
|
|
|
test_non_ascii.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 17.5 KB |
|
|
|
test_outside_wt.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 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 |
2552.2.5 | 17 years ago | Vincent Ladeuil | Revert the intrusive run_bzr('commit') rewritings. | 10.8 KB |
|
|
|
test_push.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 9.6 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 |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 2.5 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 |
2605.1.2 | 17 years ago | Martin Pool | Fix up run_bzr calls | 7.5 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 |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 6.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 |
2598.4.1 | 17 years ago | Martin Pool | Remove obsolete --clean-output, --keep-output, --n | 22.7 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 |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 1.5 KB |
|
|
|
test_status.py |
1551.15.58 | 17 years ago | Aaron Bentley | Status honours selected paths for conflicts (#1276 | 14.8 KB |
|
|
|
test_submit.py |
2520.4.132 | 17 years ago | Aaron Bentley | Merge from bzr.dev | 6.1 KB |
|
|
|
test_tags.py |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 5.8 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 |
2552.2.4 | 17 years ago | Vincent Ladeuil | Merge bzr.dev and resolve conflits. (good use case | 23 KB |
|
|
|
test_uncommit.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 7.5 KB |
|
|
|
test_update.py |
2581.1.1 | 17 years ago | Martin Pool | Merge more runbzr cleanups | 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 |
2606.1.3 | 17 years ago | Martin Pool | Update tests for new version display | 1.3 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 |
2552.2.5 | 17 years ago | Vincent Ladeuil | Revert the intrusive run_bzr('commit') rewritings. | 5.4 KB |
|
|
|
test_whoami.py |
2552.2.3 | 17 years ago | Vincent Ladeuil | Deprecate the varargs syntax and fix the tests. * | 5.1 KB |
|
|