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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
capture_tree.py |
1393.1.39 | 19 years ago | Martin Pool | - tweak capture_tree formatting | 1 KB |
|
|
|
convertfile.py |
942 | 20 years ago | Martin Pool | - update convertinv to work with current weave cod | 2.1 KB |
|
|
|
convertinv.py |
893 | 20 years ago | Martin Pool | - Refactor weave calculation of inclusions | 2 KB |
|
|
|
history2revfiles.py |
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 2.8 KB |
|
|
|
http_client.py |
1092.1.39 | 20 years ago | Robert Collins | merge from mpool | 15 KB |
|
|
|
weavebench.py |
1092.1.37 | 20 years ago | Robert Collins | unbreak weavebench | 2.6 KB |
|
|
|
weavemerge.sh |
921 | 20 years ago | Martin Pool | - shell script to set up a weave merge test case | 584 bytes |
|
|