To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2010-03-05 10:23:55 UTC
- mto: (4597.8.2 531967-unify-name-conflicts) (5112.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20100305102355-fiu8pue5ujd2aux6
Some refactoring to help address bug #531967.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.check_resolved): Use 'path' as
the parameter name as it's clearer than 'item'.
* bzrlib/conflicts.py:
(PathConflict._resolve): Implement the rename with a proper
TreeTransform. This doesn't address bug #531967 yet.
(PathConflict._get_or_infer_file_id): First (unsuccesful) try to
infer the file-id.
(ContentsConflict._resolve): Renamed from _take_it.
* bzrlib/tests/test_conflicts.py:
(TestParametrizedResolveConflicts.check_resolved): Use 'path' as
the parameter name as it's clearer than 'item'.
* bzrlib/conflicts.py:
(PathConflict._resolve): Implement the rename with a proper
TreeTransform. This doesn't address bug #531967 yet.
(PathConflict._get_or_infer_file_id): First (unsuccesful) try to
infer the file-id.
(ContentsConflict._resolve): Renamed from _take_it.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4988.10.2 | 16 years ago | michal | bzr export won't fail on symlink exporting | 6.5 KB |
|
|
|
dir_exporter.py |
5053.1.1 | 16 years ago | Martin Pool | Merge 2.1 back to trunk | 3.7 KB |
|
|
|
tar_exporter.py |
4183.7.1 | 17 years ago | Sabin Iacob | update FSF mailing address | 3.4 KB |
|
|
|
zip_exporter.py |
4763.2.4 | 16 years ago | John Arbash Meinel | merge bzr.2.1 in preparation for NEWS entry. | 3.7 KB |
|
|