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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
inventory-v2-sample.xml |
1085 | 20 years ago | Martin Pool | - add schema and example for new inventory form | 275 bytes |
|
|
|
inventory-v2.rnc |
1085 | 20 years ago | Martin Pool | - add schema and example for new inventory form | 491 bytes |
|
|
|
new-inventory-sample.xml |
149 | 20 years ago | mbp at sourcefrog | experiment with new nested inventory file format n | 19.8 KB |
|
|
|
performance.txt |
149 | 20 years ago | mbp at sourcefrog | experiment with new nested inventory file format n | 9.2 KB |
|
|
|
revfile.txt |
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 1.1 KB |
|
|
|
schemas.xml |
1085 | 20 years ago | Martin Pool | - add schema and example for new inventory form | 178 bytes |
|
|