To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Robert Collins
- Date: 2005-10-20 09:20:46 UTC
- Revision ID: robertc@robertcollins.net-20051020092046-f41cd3e0c9896b98
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)
'merge_flex' no longer calls conflict_handler.finalize(), instead that
is called by merge_inner. This is so that the conflict count can be
retrieved (and potentially manipulated) before returning to the caller
of merge_inner. Likewise 'merge' now returns the conflict count to the
caller. (Robert Collins)
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1474 | 20 years ago | Robert Collins | Merge from Aaron Bentley. | 13.8 KB |
|
|
|
http.py |
1474 | 20 years ago | Robert Collins | Merge from Aaron Bentley. | 8.4 KB |
|
|
|
local.py |
1474 | 20 years ago | Robert Collins | Merge from Aaron Bentley. | 8.2 KB |
|
|
|
memory.py |
1442.1.44 | 20 years ago | Robert Collins | Many transport related tweaks: - Remove get_parti | 2.9 KB |
|
|
|
sftp.py |
1474 | 20 years ago | Robert Collins | Merge from Aaron Bentley. | 16.4 KB |
|
|