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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
configobj
|
1185.12.49 | 19 years ago | Aaron Bentley | Switched to ConfigObj |
|
||
|
effbot
|
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
|
elementtree
|
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
|
urlgrabber
|
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
__init__.py |
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | Empty |
|
|