To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-03-02 07:58:53 UTC
- mto: (5067.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20100302075853-6mpnlk1p7ezlfnli
Fixed as per Andrew's review comments.
* bzrlib/conflicts.py:
(ContentsConflict._take_it_with_cleanups): Use
OperationWithCleanups to ensure a clean error handling.
* bzrlib/conflicts.py:
(ContentsConflict._take_it_with_cleanups): Use
OperationWithCleanups to ensure a clean error handling.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4763.2.4 | 16 years ago | John Arbash Meinel | merge bzr.2.1 in preparation for NEWS entry. | 2.4 KB |
|
|
|
medusa_based.py |
5053.1.1 | 16 years ago | Martin Pool | Merge 2.1 back to trunk | 10 KB |
|
|
|
pyftpdlib_based.py |
5053.1.1 | 16 years ago | Martin Pool | Merge 2.1 back to trunk | 7.9 KB |
|
|