To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: John Arbash Meinel
- Date: 2009-04-29 17:02:36 UTC
- Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
Add a per-implementation test that deleting lines conflicts with modifying lines.
At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171
At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4285.2.1 | 16 years ago | Vincent Ladeuil | Cleanup test imports and use features to better tr | 15.1 KB |
|
|
|
test_annotate_iter.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.2 KB |
|
|
|
test_get_file_mtime.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.6 KB |
|
|
|
test_get_root_id.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.5 KB |
|
|
|
test_get_symlink_target.py |
4285.2.1 | 16 years ago | Vincent Ladeuil | Cleanup test imports and use features to better tr | 2.2 KB |
|
|
|
test_inv.py |
4285.2.1 | 16 years ago | Vincent Ladeuil | Cleanup test imports and use features to better tr | 6.5 KB |
|
|
|
test_iter_search_rules.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 3.1 KB |
|
|
|
test_list_files.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.1 KB |
|
|
|
test_path_content_summary.py |
4285.2.1 | 16 years ago | Vincent Ladeuil | Cleanup test imports and use features to better tr | 4.8 KB |
|
|
|
test_revision_tree.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.2 KB |
|
|
|
test_test_trees.py |
4285.2.1 | 16 years ago | Vincent Ladeuil | Cleanup test imports and use features to better tr | 13.8 KB |
|
|
|
test_tree.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 10.8 KB |
|
|
|
test_walkdirs.py |
4285.2.1 | 16 years ago | Vincent Ladeuil | Cleanup test imports and use features to better tr | 4.4 KB |
|
|