To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-01-06 11:18:45 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20100106111845-inun0xxl8rx4yvst
Fixed as per Aaron's remark.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop.test_resolve_keeping_mine,
TestResolveParentLoop.test_resolve_taking_theirs): Toghten the
tests as debug showed they were passing with bogus code.
* bzrlib/conflicts.py:
(ParentLoop.take_theirs): Use a TreeTransform to safely rename
multiple files at once.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop.test_resolve_keeping_mine,
TestResolveParentLoop.test_resolve_taking_theirs): Toghten the
tests as debug showed they were passing with bogus code.
* bzrlib/conflicts.py:
(ParentLoop.take_theirs): Use a TreeTransform to safely rename
multiple files at once.
| 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 |
|
|