- Committer: Aaron Bentley
- Date: 2006-04-16 16:20:46 UTC
- Revision ID: aaron.bentley@utoronto.ca-20060416162046-a50698189b032755
Handle binary files for diff3 merges
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
doc
|
1530.2.1 | 18 years ago | Robert Collins | Start tests for api usage. |
|
||
|
export
|
1185.31.12 | 19 years ago | John Arbash Meinel | Refactored the export code to make it easier to ad |
|
||
|
plugins
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
store
|
1185.11.1 | 19 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not |
|
||
|
tests
|
1185.31.25 | 18 years ago | John Arbash Meinel | Renamed all of the tests from selftest/foo.py to t |
|
||
|
transport
|
1185.11.1 | 19 years ago | John Arbash Meinel | (broken) Transport work is merged in. Tests do not |
|
||
|
ui
|
1185.49.21 | 18 years ago | John Arbash Meinel | Refactored bzrlib/ui.py into a module with the pos |
|
||
|
util
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
__init__.py |
1534.5.5 | 18 years ago | Robert Collins | Move is_control_file into WorkingTree.is_control_f | 3.3 KB |
|
|
|
add.py |
1534.5.5 | 18 years ago | Robert Collins | Move is_control_file into WorkingTree.is_control_f | 6.3 KB |
|
|
|
annotate.py |
1563.2.1 | 18 years ago | Robert Collins | Merge in a variation of the versionedfile api from | 3.1 KB |
|
|
|
atomicfile.py |
1185.50.20 | 18 years ago | John Arbash Meinel | merge permissions branch, also fixup tests so they | 3 KB |
|
|
|
branch.py |
1624.3.19 | 18 years ago | Olaf Conradi | New call get_format_description to give a user-fri | 48.4 KB |
|
|
|
builtins.py |
1652 | 18 years ago | Canonical.com Patch Queue Manager | (olaf) much improved bzr info output | 89.5 KB |
|
|
|
bzrdir.py |
1624.3.19 | 18 years ago | Olaf Conradi | New call get_format_description to give a user-fri | 65.9 KB |
|
|
|
check.py |
1616.1.5 | 18 years ago | Martin Pool | Cleanup and document some check code | 9.6 KB |
|
|
|
commands.py |
1616.1.15 | 18 years ago | Martin Pool | Handle 'bzr ?', etc. | 21.9 KB |
|
|
|
commit.py |
1534.10.27 | 18 years ago | Aaron Bentley | Merge from mainline | 22.2 KB |
|
|
|
config.py |
1632 | 18 years ago | Canonical.com Patch Queue Manager | Various fixes for win32 | 19.8 KB |
|
|
|
conflicts.py |
1534.10.25 | 18 years ago | Aaron Bentley | Move select_conflicts into ConflictList | 12.9 KB |
|
|
|
decorators.py |
1534.4.48 | 18 years ago | Robert Collins | Make needs_read_lock and needs_write_lock more vis | 1.7 KB |
|
|
|
delta.py |
1185.50.49 | 18 years ago | John Arbash Meinel | [merge] 0.7-bugfix: Fix fileid_involved to unescap | 8.6 KB |
|
|
|
diff.py |
1558.15.2 | 18 years ago | Aaron Bentley | Implemented binary file handling for diff | 11.3 KB |
|
|
|
errors.py |
1558.15.1 | 18 years ago | Aaron Bentley | Add text_file function | 23.8 KB |
|
|
|
externalcommand.py |
1558.1.9 | 18 years ago | Aaron Bentley | Merged aliases | 2.1 KB |
|
|
|
fetch.py |
1615.1.2 | 18 years ago | Martin Pool | [merge] robert's knit-performance work | 11.4 KB |
|
|
|
gpg.py |
1185.78.4 | 18 years ago | John Arbash Meinel | Reverting gpg changes, should not be mainline, see | 2.6 KB |
|
|
|
graph.py |
1594.2.15 | 18 years ago | Robert Collins | Unfuck performance. | 5.9 KB |
|
|
|
hashcache.py |
1616.1.2 | 18 years ago | Martin Pool | Emit trace message about hash cache performance. | 9.2 KB |
|
|
|
help.py |
1553.5.4 | 18 years ago | Martin Pool | [patch] better formatting for 'bzr help commands' | 4.9 KB |
|
|
|
identitymap.py |
1563.2.25 | 18 years ago | Robert Collins | Merge in upstream. | 3.3 KB |
|
|
|
info.py |
1624.3.21 | 18 years ago | Olaf Conradi | Make bzr info command work on both local and remot | 9.2 KB |
|
|
|
inter.py |
1563.2.12 | 18 years ago | Robert Collins | Checkpointing: created InterObject to factor out c | 2.8 KB |
|
|
|
intset.py |
1185.50.24 | 18 years ago | John Arbash Meinel | Added set_remove to get the set delete function to | 5.3 KB |
|
|
|
inventory.py |
1558.15.2 | 18 years ago | Aaron Bentley | Implemented binary file handling for diff | 40.4 KB |
|
|
|
iterablefile.py |
1185.65.29 | 18 years ago | Robert Collins | Implement final review suggestions. | 7.7 KB |
|
|
|
knit.py |
1641.1.1 | 18 years ago | Robert Collins | * Various microoptimisations to knit and gzip - r | 60.8 KB |
|
|
|
lock.py |
1553.5.46 | 18 years ago | Martin Pool | doc | 8.2 KB |
|
|
|
lockable_files.py |
1594.2.22 | 18 years ago | Robert Collins | Ensure that lockable files calls finish() on trans | 11.1 KB |
|
|
|
lockdir.py |
1558.10.1 | 18 years ago | Aaron Bentley | Handle lockdirs over NFS properly | 14.1 KB |
|
|
|
log.py |
1624.1.3 | 18 years ago | Robert Collins | Convert log to use the new tsort.merge_sort routin | 17.7 KB |
|
|
|
lsprof.py |
1185.33.86 | 18 years ago | Martin Pool | Add additional module for lsprof. | 3.5 KB |
|
|
|
merge.py |
1558.15.3 | 18 years ago | Aaron Bentley | Handle binary files for diff3 merges | 37.3 KB |
|
|
|
merge3.py |
1185.33.62 | 18 years ago | Martin Pool | doc | 13.7 KB |
|
|
|
missing.py |
1594.1.3 | 18 years ago | Robert Collins | Fixup pb usage to use nested_progress_bar. | 4.1 KB |
|
|
|
msgeditor.py |
1553.4.9 | 18 years ago | Michael Ellerman | Make the "ignore line" in the commit message edito | 4.8 KB |
|
|
|
option.py |
1587.1.6 | 18 years ago | Robert Collins | Update bound branch implementation to 0.8. | 8.2 KB |
|
|
|
osutils.py |
1636.1.1 | 18 years ago | Robert Collins | Fix calling relpath() and abspath() on transports | 16.5 KB |
|
|
|
patch.py |
1558.15.3 | 18 years ago | Aaron Bentley | Handle binary files for diff3 merges | 2.3 KB |
|
|
|
plugin.py |
1534.7.158 | 18 years ago | Aaron Bentley | Merged John Meinel's integration | 6.2 KB |
|
|
|
progress.py |
1558.8.6 | 18 years ago | Aaron Bentley | Fix note implementation | 16.2 KB |
|
|
|
reconcile.py |
1607.1.11 | 18 years ago | Robert Collins | Merge from bzr.dev | 14.5 KB |
|
|
|
repository.py |
1624.3.22 | 18 years ago | Olaf Conradi | Merge bzr.dev | 74.4 KB |
|
|
|
revision.py |
1607.1.12 | 18 years ago | Robert Collins | Fix common_ancestor to still calculate a common an | 16 KB |
|
|
|
revisionspec.py |
1534.1.31 | 18 years ago | Robert Collins | Deprecated fetch.fetch and fetch.greedy_fetch for | 11.7 KB |
|
|
|
rio.py |
1534.10.2 | 18 years ago | Aaron Bentley | Implemented rio_file to produce a light file objec | 7.8 KB |
|
|
|
shellcomplete.py |
1185.33.32 | 18 years ago | Martin Pool | [merge] fix \t in commit messages | 1.9 KB |
|
|
|
sign_my_commits.py |
1563.2.29 | 18 years ago | Robert Collins | Remove all but fetch references to repository.revi | 2.7 KB |
|
|
|
status.py |
1534.10.24 | 18 years ago | Aaron Bentley | Eliminated conflicts_to_strings, made remove_files | 6.3 KB |
|
|
|
symbol_versioning.py |
1581.1.1 | 18 years ago | Robert Collins | Bugfix aliases to be backwards compatible with plu | 5.4 KB |
|
|
|
testament.py |
1553.3.2 | 18 years ago | Marien Zwart | Remove a useless local function. | 7 KB |
|
|
|
textfile.py |
1558.15.3 | 18 years ago | Aaron Bentley | Handle binary files for diff3 merges | 930 bytes |
|
|
|
textinv.py |
1399.1.6 | 19 years ago | Robert Collins | move exporting functionality into inventory.py - u | 2.5 KB |
|
|
|
textui.py |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 1.1 KB |
|
|
|
trace.py |
1558.8.1 | 18 years ago | Aaron Bentley | Fix overall progress bar's interaction with 'note' | 8.6 KB |
|
|
|
transactions.py |
1594.2.20 | 18 years ago | Robert Collins | Add finished() notifications to transactions. | 6.5 KB |
|
|
|
transform.py |
1558.12.7 | 18 years ago | Aaron Bentley | Fixed revert with missing files | 47.4 KB |
|
|
|
tree.py |
1563.2.14 | 18 years ago | Robert Collins | Prepare weave store to delegate copy details to th | 8.1 KB |
|
|
|
tsort.py |
1624.1.3 | 18 years ago | Robert Collins | Convert log to use the new tsort.merge_sort routin | 20.3 KB |
|
|
|
tuned_gzip.py |
1641.1.1 | 18 years ago | Robert Collins | * Various microoptimisations to knit and gzip - r | 11.1 KB |
|
|
|
uncommit.py |
1558.9.1 | 18 years ago | Aaron Bentley | Fix uncommit to handle bound branches, and to do l | 1.8 KB |
|
|
|
upgrade.py |
1558.7.2 | 18 years ago | Aaron Bentley | Upgrade works in repositories | 3 KB |
|
|
|
versionedfile.py |
1616.1.18 | 18 years ago | Martin Pool | (weave-merge) don't treat killed-both lines as poi | 24.3 KB |
|
|
weave.py |
1616.1.18 | 18 years ago | Martin Pool | (weave-merge) don't treat killed-both lines as poi | 52 KB |
|
|
|
weave_commands.py |
1616.1.17 | 18 years ago | Martin Pool | New 'weave-plan-merge' and 'weave-merge-text' comm | 3 KB |
|
|
|
weavefile.py |
1596.2.27 | 18 years ago | Robert Collins | Note potential improvements in knit adds. | 5.4 KB |
|
|
|
win32console.py |
1185.16.86 | 19 years ago | mbp at sourcefrog | - win32 get_console_size from Alexander | 1 KB |
|
|
|
workingtree.py |
1624.3.22 | 18 years ago | Olaf Conradi | Merge bzr.dev | 60.1 KB |
|
|
|
xml4.py |
1540.1.6 | 18 years ago | John Arbash Meinel | fileid_involved needs to unescape the file id and | 6.5 KB |
|
|
|
xml5.py |
1638.1.2 | 18 years ago | Robert Collins | Change the basis-inventory file to not have the re | 7.5 KB |
|
|
|
xml_serializer.py |
1540.1.6 | 18 years ago | John Arbash Meinel | fileid_involved needs to unescape the file id and | 2.6 KB |
|
|