To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-03-01 13:55:49 UTC
- mto: (4597.11.1 537956-parent-loop-incomplete) (5112.1.1 integration) (5113.1.1 integration) (5114.1.1 various) (5401.1.1 integration) (5067.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20100301135549-gxwcs9fyk4t8fitb
Reproduce bug #529968.
* bzrlib/tests/test_conflicts.py:
(OldTestResolveContentConflicts): Remove blackbox tests.
(TestResolveContentConflicts.test_resolve_taking_this): Ensure we
end up with the right path for the file when the conflict is
resolved.
(TestResolveContentConflicts.test_resolve_taking_other): Ensure we
end up with no file after the conflict is resolved.
* bzrlib/tests/test_conflicts.py:
(OldTestResolveContentConflicts): Remove blackbox tests.
(TestResolveContentConflicts.test_resolve_taking_this): Ensure we
end up with the right path for the file when the conflict is
resolved.
(TestResolveContentConflicts.test_resolve_taking_other): Ensure we
end up with no file after the conflict is resolved.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 5.9 KB |
|
|
|
heavily_merged.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.6 KB |
|
|
|
kernel_like.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 7.9 KB |
|
|
|
many_commit.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 2.3 KB |
|
|
|
simple_many_commit.py |
4183.7.1 | 16 years ago | Sabin Iacob | update FSF mailing address | 1.5 KB |
|
|