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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
bash
|
331 | 20 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
|
emacs
|
1110 | 20 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
|
zsh
|
331 | 20 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
add-bzr-to-baz |
690 | 20 years ago | Martin Pool | add-bzr-to-baz allows multiple arguments | 223 bytes |
|
|
|
create_bzr_rollup.py |
625 | 20 years ago | Martin Pool | - fix permissions on exported tar/zip files | 5.5 KB |
|
|
|
fortune |
423 | 20 years ago | Martin Pool | - Add fortune-cookie external plugin demonstration | 306 bytes |
|
|
|
newinventory.py |
1390 | 19 years ago | Robert Collins | pair programming worx... merge integration and wea | 4.3 KB |
|
|
|
pwclient.full |
715 | 20 years ago | Martin Pool | - add jk's patchwork client | 13 KB |
|
|
|
pwk |
856 | 20 years ago | Martin Pool | - fix pwk help | 951 bytes |
|
|
|
upload-bzr.dev |
788 | 20 years ago | Martin Pool | - tweak rsync upload script | 829 bytes |
|
|