- Committer: Aaron Bentley
- Date: 2008-05-23 21:45:50 UTC
- Revision ID: aaron@aaronbentley.com-20080523214550-am926ey6mus29bu9
Fix handling of old merge directives with stricter get_parent_map
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
benchmarks
|
1707.2.2 | 18 years ago | Robert Collins | Start on bench_add, an add benchtest. |
|
||
|
bundle
|
1185.82.130 | 18 years ago | Aaron Bentley | Rename changesets to revision bundles |
|
||
|
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 |
|
||
|
help_topics
|
3089.3.6 | 16 years ago | Ian Clatworthy | make help topics more discoverable |
|
||
|
plugins
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
repofmt
|
2241.1.1 | 17 years ago | Martin Pool | Change RepositoryFormat to use a Registry rather t |
|
||
|
smart
|
2018.5.139 | 17 years ago | Andrew Bennetts | Merge from bzr.dev, resolving conflicts. |
|
||
|
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 |
|
||
|
version_info_formats
|
2022.1.1 | 18 years ago | John Arbash Meinel | [merge] version-info plugin, and cleanup for layou |
|
||
__init__.py |
3427.1.2 | 16 years ago | John Arbash Meinel | Merge in bzr-1.5 | 3.4 KB |
|
|
|
_dirstate_helpers_c.h |
2668.1.1 | 17 years ago | John Arbash Meinel | (Lukáš Lalinský) Add a special header for intptr_t | 153 bytes |
|
|
|
_dirstate_helpers_c.pyx |
2904.2.1 | 17 years ago | John Arbash Meinel | Switch from __new__ to __init__ to avoid potential | 23.8 KB |
|
|
|
_dirstate_helpers_py.py |
3376.2.8 | 16 years ago | Martin Pool | Some review cleanups for assertion removal | 9.9 KB |
|
|
|
_knit_load_data_c.pyx |
3287.5.5 | 16 years ago | Robert Collins | Refactor internals of knit implementations to impl | 10.3 KB |
|
|
|
_knit_load_data_py.py |
3287.5.5 | 16 years ago | Robert Collins | Refactor internals of knit implementations to impl | 3.6 KB |
|
|
|
_patiencediff_c.c |
3074.2.9 | 16 years ago | John Arbash Meinel | Large simplification by ignoring len() and just st | 36.8 KB |
|
|
_patiencediff_py.py |
3376.2.8 | 16 years ago | Martin Pool | Some review cleanups for assertion removal | 8.9 KB |
|
|
|
add.py |
3400.3.6 | 16 years ago | Martin Pool | Remove code deprecated prior to 1.1 and its tests | 4.3 KB |
|
|
|
annotate.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 15 KB |
|
|
|
api.py |
2550.2.3 | 17 years ago | Robert Collins | Add require_api API. | 2.9 KB |
|
|
|
atomicfile.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 3.8 KB |
|
|
|
bisect_multi.py |
2890.2.3 | 17 years ago | Robert Collins | * New module ``bzrlib.bisect_multi`` with generic | 2.6 KB |
|
|
|
branch.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 84 KB |
|
|
|
branchbuilder.py |
2466.7.10 | 17 years ago | Robert Collins | Add a format parameter to BranchBuilder. | 2.4 KB |
|
|
|
breakin.py |
2453.1.1 | 17 years ago | Alexander Belchenko | explicitly check for SIGQUIT in 'signal' stdlib mo | 1.4 KB |
|
|
|
bugtracker.py |
3270.5.3 | 16 years ago | James Westby | No longer add an extra class to accomoadate gnome. | 9 KB |
|
|
|
builtins.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 173 KB |
|
|
|
bzrdir.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 111 KB |
|
|
|
cache_utf8.py |
2360.1.6 | 17 years ago | John Arbash Meinel | Change utf8_decode_with_None to return what we car | 4.3 KB |
|
|
|
check.py |
3036.1.3 | 16 years ago | Robert Collins | Privatise VersionedFileChecker. | 10.8 KB |
|
|
|
cmd_version_info.py |
3231.2.1 | 16 years ago | James Westby | Make version-info --custom imply --all. When usin | 4.1 KB |
|
|
|
commands.py |
3418.7.2 | 16 years ago | John Arbash Meinel | Cherrypick the deprecation suppression for 1.5 | 30.3 KB |
|
|
|
commit.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 36.6 KB |
|
|
|
config.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 40.5 KB |
|
|
|
conflicts.py |
3144.4.2 | 16 years ago | Aaron Bentley | Handle non-directory parent conflicts (abentley, # | 16.7 KB |
|
|
|
counted_lock.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 2.5 KB |
|
|
|
debug.py |
3390.1.3 | 16 years ago | Andrew Bennetts | Merge from bzr.dev. | 1.7 KB |
|
|
|
decorators.py |
2230.2.6 | 17 years ago | John Arbash Meinel | Clean up the documentation and imports for decorat | 6.3 KB |
|
|
|
delta.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 15.7 KB |
|
|
|
deprecated_graph.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 5.9 KB |
|
|
|
diff.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 34.5 KB |
|
|
|
directory_service.py |
3251.3.5 | 16 years ago | Aaron Bentley | Update docstring | 2 KB |
|
|
|
dirstate.py |
3376.2.8 | 16 years ago | Martin Pool | Some review cleanups for assertion removal | 127 KB |
|
|
|
email_message.py |
2639.1.2 | 17 years ago | John Arbash Meinel | Some cleanups for the EmailMessage class. Remove s | 8 KB |
|
|
|
errors.py |
3245.4.57 | 16 years ago | Andrew Bennetts | Merge bzr.dev via loom thread. | 70.1 KB |
|
|
|
externalcommand.py |
2367.2.1 | 17 years ago | Robert Collins | Remove bzrlib 0.8 compatability where it was makin | 2.1 KB |
|
|
|
fetch.py |
3350.3.22 | 16 years ago | Robert Collins | Review feedback. | 18.7 KB |
|
|
|
generate_ids.py |
2568.2.2 | 17 years ago | Robert Collins | * New method ``_glob_expand_file_list_if_needed`` | 4.3 KB |
|
|
|
globbing.py |
2318.2.3 | 17 years ago | Kent Gibson | merged bzr.dev | 7.8 KB |
|
|
|
gpg.py |
1551.12.52 | 17 years ago | Aaron Bentley | speling fix | 3.7 KB |
|
|
|
graph.py |
3443 | 16 years ago | Canonical.com Patch Queue Manager | (jam) refactor find_unique_ancestors for clarity, | 58.4 KB |
|
|
|
hashcache.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 10.4 KB |
|
|
|
help.py |
3400.3.6 | 16 years ago | Martin Pool | Remove code deprecated prior to 1.1 and its tests | 5.5 KB |
|
|
|
hooks.py |
3256.2.30 | 16 years ago | Daniel Watkins | Updated deprecation warnings and tests. | 3.1 KB |
|
|
|
identitymap.py |
2375.1.5 | 17 years ago | Andrew Bennetts | Deal with review comments from Robert: * Add my | 2.5 KB |
|
|
|
ignores.py |
2318.2.3 | 17 years ago | Kent Gibson | merged bzr.dev | 5.1 KB |
|
|
|
index.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 57.9 KB |
|
|
|
info.py |
3400.3.6 | 16 years ago | Martin Pool | Remove code deprecated prior to 1.1 and its tests | 16.3 KB |
|
|
|
inspect_for_copy.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 2.5 KB |
|
|
|
inter.py |
2241.1.4 | 17 years ago | Martin Pool | Moved old weave-based repository formats into bzrl | 4.4 KB |
|
|
|
intset.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 5.2 KB |
|
|
|
inventory.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 48.7 KB |
|
|
|
iterablefile.py |
2052.3.3 | 18 years ago | John Arbash Meinel | Add (c) Canonical to files that Aaron has approved | 7.7 KB |
|
|
|
knit.py |
3350.4.4 | 16 years ago | Robert Collins | Merge up bzr.dev. | 136 KB |
|
|
|
lazy_import.py |
3376.2.8 | 16 years ago | Martin Pool | Some review cleanups for assertion removal | 15.7 KB |
|
|
|
lazy_regex.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 3.7 KB |
|
|
|
lock.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 16.3 KB |
|
|
|
lockable_files.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 14.2 KB |
|
|
|
lockdir.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 23.3 KB |
|
|
|
log.py |
3434 | 16 years ago | Canonical.com Patch Queue Manager | (jam) Proper fix for bug #211661, passing None to | 31.4 KB |
|
|
|
lru_cache.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 7.8 KB |
|
|
|
lsprof.py |
2911.6.4 | 17 years ago | Blake Winton | Fix test failures | 8.7 KB |
|
|
|
mail_client.py |
3324.4.1 | 16 years ago | Xavier Maillard | Replace mail-mode call with compose-mail from GNU | 16.4 KB |
|
|
|
memorytree.py |
2946.3.5 | 17 years ago | John Arbash Meinel | MemoryTree is not tested under the tree_implementa | 10.2 KB |
|
|
|
merge.py |
1551.19.44 | 16 years ago | Aaron Bentley | Fix handling of old merge directives with stricter | 60 KB |
|
|
|
merge3.py |
3376.2.9 | 16 years ago | Martin Pool | Restore some assertions as comments | 16.4 KB |
|
|
|
merge_directive.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 22.5 KB |
|
|
|
missing.py |
3427.3.6 | 16 years ago | John Arbash Meinel | review feedback from Ian | 5.4 KB |
|
|
|
msgeditor.py |
3376.1.1 | 16 years ago | Martin Pool | Fix incorrect indentation (#220333) | 9.5 KB |
|
|
|
multiparent.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 23.9 KB |
|
|
|
mutabletree.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 23 KB |
|
|
|
option.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 20.3 KB |
|
|
|
osutils.py |
3449 | 16 years ago | Canonical.com Patch Queue Manager | Fix MemoryError during large fetches over HTTP. (E | 45.6 KB |
|
|
|
pack.py |
2535.4.23 | 17 years ago | Andrew Bennetts | Merge streamable-containers. | 17.5 KB |
|
|
|
patch.py |
1711.7.20 | 18 years ago | John Arbash Meinel | always close files, minor PEP8 cleanup | 3.3 KB |
|
|
|
patches.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 12.9 KB |
|
|
|
patiencediff.py |
2781.1.1 | 17 years ago | Martin Pool | merge cpatiencediff from Lukas | 5.6 KB |
|
|
|
plugin.py |
3427.2.2 | 16 years ago | James Westby | Just print the exception, keeping the API of log_e | 15.2 KB |
|
|
|
progress.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 17.5 KB |
|
|
|
reconcile.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 23.2 KB |
|
|
|
reconfigure.py |
3338.1.3 | 16 years ago | Aaron Bentley | Merge bzr.dev | 12.6 KB |
|
|
|
registry.py |
3251.3.2 | 16 years ago | Aaron Bentley | Add testing of Registry.get_prefix | 8.8 KB |
|
|
|
remote.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 62 KB |
|
|
|
repository.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 127 KB |
|
|
|
revision.py |
3350.4.4 | 16 years ago | Robert Collins | Merge up bzr.dev. | 6.7 KB |
|
|
|
revisionspec.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 29.1 KB |
|
|
|
revisiontree.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 7.1 KB |
|
|
|
rio.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 13.1 KB |
|
|
|
shellcomplete.py |
2279.2.1 | 17 years ago | mbp at sourcefrog | (trivial) fix short_name() call in shellcomplete ( | 2.5 KB |
|
|
|
sign_my_commits.py |
3010.1.15 | 16 years ago | Robert Collins | Manage write groups in sign_my_commits, for effici | 3.1 KB |
|
|
|
smtp_connection.py |
2900.2.17 | 17 years ago | Vincent Ladeuil | merge bzr.dev | 5.8 KB |
|
|
|
status.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 10.2 KB |
|
|
|
strace.py |
2566.3.4 | 17 years ago | Vincent Ladeuil | Take Martin and Robert comments into account. * b | 3.1 KB |
|
|
|
switch.py |
3078.2.6 | 16 years ago | Ian Clatworthy | fix efficiency of local commit detection as recomm | 5.1 KB |
|
|
|
symbol_versioning.py |
3427.2.5 | 16 years ago | John Arbash Meinel | Change deprecated_in to end with a '.' | 13.2 KB |
|
|
|
tag.py |
2831.8.1 | 17 years ago | James Westby | Fix log against smart server branches that don't s | 7.8 KB |
|
|
|
testament.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 8.4 KB |
|
|
|
textfile.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.7 KB |
|
|
|
textinv.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 2.5 KB |
|
|
|
textmerge.py |
1711.2.24 | 18 years ago | John Arbash Meinel | Late bind to PatienceSequenceMatcher to allow plug | 5.2 KB |
|
|
|
textui.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 1.2 KB |
|
|
|
timestamp.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 5.9 KB |
|
|
|
trace.py |
3427.2.2 | 16 years ago | James Westby | Just print the exception, keeping the API of log_e | 15.3 KB |
|
|
|
transactions.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 6.5 KB |
|
|
|
transform.py |
3407.2.10 | 16 years ago | Martin Pool | Merge trunk | 85.7 KB |
|
|
|
tree.py |
3376.2.13 | 16 years ago | Martin Pool | Merge trunk | 36.7 KB |
|
|
|
treebuilder.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 2.6 KB |
|
|
|
tsort.py |
3246.2.2 | 16 years ago | Martin Pool | Fix up import of tsort | 30.4 KB |
|
|
|
tuned_gzip.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 14.5 KB |
|
|
|
uncommit.py |
3280.4.4 | 16 years ago | John Arbash Meinel | uncommit --local in an unbound branch raises the s | 4 KB |
|
|
|
upgrade.py |
3280.1.1 | 16 years ago | Ian Clatworthy | (Martin Albisetti) Change backup dir from .bzr.bac | 3.2 KB |
|
|
|
urlutils.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 22.2 KB |
|
|
|
version.py |
3293.2.1 | 16 years ago | Martin Pool | Better formatting of python version in --version | 3.8 KB |
|
|
|
versionedfile.py |
3350.4.4 | 16 years ago | Robert Collins | Merge up bzr.dev. | 31.9 KB |
|
|
|
weave.py |
3350.3.21 | 16 years ago | Robert Collins | Merge bzr.dev. | 46.4 KB |
|
|
|
weave_commands.py |
1551.15.24 | 17 years ago | Aaron Bentley | Make list-weave list knits, rename to list-version | 3.4 KB |
|
|
|
weavefile.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 5.1 KB |
|
|
|
win32utils.py |
3023.1.2 | 16 years ago | Alexander Belchenko | Martin's review. | 10.1 KB |
|
|
|
workingtree.py |
3446.1.1 | 16 years ago | Martin Pool | merge further LockableFile deprecations | 112 KB |
|
|
|
workingtree_4.py |
3407.2.14 | 16 years ago | Martin Pool | Remove more cases of getting transport via control | 111 KB |
|
|
|
xml4.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 6.1 KB |
|
|
|
xml5.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 2.8 KB |
|
|
|
xml6.py |
3311.3.3 | 16 years ago | Aaron Bentley | Handle format 5 revision | 1.1 KB |
|
|
|
xml7.py |
2255.2.152 | 17 years ago | Martin Pool | (broken) merge aaron's workingtree format changes | 1.6 KB |
|
|
|
xml8.py |
3376.2.4 | 16 years ago | Martin Pool | Remove every assert statement from bzrlib! Depend | 17.7 KB |
|
|
|
xml_serializer.py |
3311.3.2 | 16 years ago | Aaron Bentley | Implement version numbers for format 8 | 6.5 KB |
|
|