- Committer: Canonical.com Patch Queue Manager
- Date: 2010-02-10 16:25:28 UTC
- mfrom: (5020.1.1 integration)
- Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
on conflicts
on conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4332.3.32 | 15 years ago | Robert Collins | Merge bzr.dev. | 3.7 KB |
|
|
|
test_add.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 6.6 KB |
|
|
|
test_add_reference.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 4.4 KB |
|
|
|
test_annotate_iter.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 7.9 KB |
|
|
|
test_basis_inventory.py |
4617.5.1 | 15 years ago | Robert Collins | Stop poking under the hood for inventory equality | 3.3 KB |
|
|
|
test_basis_tree.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 2.9 KB |
|
|
|
test_break_lock.py |
4985.1.5 | 14 years ago | Vincent Ladeuil | Deploying the new overrideAttr facility further re | 2.7 KB |
|
|
|
test_changes_from.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 2.1 KB |
|
|
|
test_check.py |
4332.3.33 | 15 years ago | Robert Collins | workingtree_implementations has been renamed. | 1.9 KB |
|
|
|
test_commit.py |
4985.1.5 | 14 years ago | Vincent Ladeuil | Deploying the new overrideAttr facility further re | 25.5 KB |
|
|
|
test_content_filters.py |
4985.1.5 | 14 years ago | Vincent Ladeuil | Deploying the new overrideAttr facility further re | 16.1 KB |
|
|
|
test_eol_conversion.py |
4985.1.5 | 14 years ago | Vincent Ladeuil | Deploying the new overrideAttr facility further re | 14 KB |
|
|
|
test_executable.py |
4676.4.1 | 15 years ago | Martin Pool | merge 2.0rc2, sphinx, and various fixes back to tr | 7.3 KB |
|
|
|
test_flush.py |
4648.1.3 | 15 years ago | Robert Collins | Improve behaviour of tests that have a reasonable | 3.2 KB |
|
|
|
test_get_file_mtime.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 3.3 KB |
|
|
|
test_get_parent_ids.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 2.5 KB |
|
|
|
test_inv.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 6.2 KB |
|
|
|
test_is_control_filename.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 1.7 KB |
|
|
|
test_is_ignored.py |
4948.5.1 | 14 years ago | John Whitley | Implementation of ignore exclusions and basic test | 9.1 KB |
|
|
|
test_locking.py |
4648.1.3 | 15 years ago | Robert Collins | Improve behaviour of tests that have a reasonable | 12.2 KB |
|
|
|
test_merge_from_branch.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 4.8 KB |
|
|
|
test_mkdir.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 1.4 KB |
|
|
|
test_move.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 23.5 KB |
|
|
|
test_nested_specifics.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 2.7 KB |
|
|
|
test_parents.py |
4634.35.18 | 15 years ago | Andrew Bennetts | Fix per_workingtree.test_parents. | 33.3 KB |
|
|
|
test_paths2ids.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 7.7 KB |
|
|
|
test_pull.py |
4634.123.2 | 14 years ago | John Arbash Meinel | pull also is broken wrt root-id changes. | 2.7 KB |
|
|
|
test_put_file.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 1.5 KB |
|
|
|
test_read_working_inventory.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 1.8 KB |
|
|
|
test_readonly.py |
4985.2.1 | 14 years ago | Vincent Ladeuil | Deploy addAttrCleanup on the whole test suite. Se | 4.3 KB |
|
|
|
test_remove.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 13 KB |
|
|
|
test_rename_one.py |
4560.1.1 | 15 years ago | Ian Clatworthy | (igc) Allow rename of items already removed from t | 14 KB |
|
|
|
test_revision_tree.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 3.7 KB |
|
|
|
test_set_root_id.py |
4957.1.1 | 14 years ago | John Arbash Meinel | Merge bzr.stable, bringing in bug fixes #175839, # | 3 KB |
|
|
|
test_smart_add.py |
5013.2.3 | 14 years ago | Vincent Ladeuil | Simplify some tests in per_workingtree/test_smart_ | 10.6 KB |
|
|
|
test_uncommit.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 1.2 KB |
|
|
|
test_unversion.py |
4536.2.1 | 15 years ago | Robert Collins | Fix WorkingTree4.unversion when unversioning the p | 8.2 KB |
|
|
|
test_views.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 7.5 KB |
|
|
|
test_walkdirs.py |
4523.1.4 | 15 years ago | Martin Pool | Rename remaining *_implementations tests | 9.6 KB |
|
|
|
test_workingtree.py |
4985.3.21 | 14 years ago | Vincent Ladeuil | Final cleanup. * bzrlib/tests/per_workingtree/tes | 44.3 KB |
|
|