- Committer: Aaron Bentley
- Date: 2008-03-11 14:29:08 UTC
- Revision ID: aaron@aaronbentley.com-20080311142908-yyrvcpn2mldt0fnn
Update documentation to reflect conflict-handling difference
| 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 | 19 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 | 19 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 |
3235.1.1 | 16 years ago | Martin Pool | Merge 1.2 branch | 2 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 |
2872.4.10 | 17 years ago | Martin Pool | docstrings for cmp_ functions seem to be backwards | 9.7 KB |
|
|
|
_knit_load_data_c.pyx |
2904.2.1 | 17 years ago | John Arbash Meinel | Switch from __new__ to __init__ to avoid potential | 10.3 KB |
|
|
|
_knit_load_data_py.py |
2484.1.24 | 17 years ago | John Arbash Meinel | Add direct tests of how we handle incomplete/'brok | 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 |
2781.1.1 | 17 years ago | Martin Pool | merge cpatiencediff from Lukas | 8.8 KB |
|
|
|
add.py |
2568.2.4 | 17 years ago | Robert Collins | * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_ | 5.1 KB |
|
|
|
annotate.py |
3180.2.2 | 16 years ago | John Arbash Meinel | Fix typo, (thanks Ian) | 9.2 KB |
|
|
|
api.py |
2550.2.3 | 17 years ago | Robert Collins | Add require_api API. | 2.9 KB |
|
|
|
atomicfile.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 3.7 KB |
|
|
|
bisect_multi.py |
2890.2.3 | 17 years ago | Robert Collins | * New module ``bzrlib.bisect_multi`` with generic | 2.6 KB |
|
|
|
branch.py |
3136.1.8 | 16 years ago | Aaron Bentley | Merge with bzr.dev | 78.2 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 |
3154.1.1 | 16 years ago | Ian Clatworthy | Minor tweaks to bug tracker integration documentat | 8.9 KB |
|
|
|
builtins.py |
3235.1.1 | 16 years ago | Martin Pool | Merge 1.2 branch | 169 KB |
|
|
|
bzrdir.py |
3136.1.8 | 16 years ago | Aaron Bentley | Merge with bzr.dev | 107 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 | 17 years ago | Robert Collins | Privatise VersionedFileChecker. | 10.8 KB |
|
|
|
cmd_version_info.py |
2948.4.3 | 17 years ago | Lukáš Lalinský | Fix problems from Alexander's review. | 4.1 KB |
|
|
|
commands.py |
3169.3.4 | 16 years ago | Andrew Bennetts | Warn if --coverage is used with a conflicting glob | 29.2 KB |
|
|
|
commit.py |
3113.6.7 | 16 years ago | Aaron Bentley | Fix commit for a checkout sharing a repo with its | 36.7 KB |
|
|
|
config.py |
3063.3.2 | 16 years ago | Lukáš Lalinský | Move the name and e-mail address extraction logic | 38.5 KB |
|
|
|
conflicts.py |
3144.4.2 | 16 years ago | Aaron Bentley | Handle non-directory parent conflicts (abentley, # | 16.7 KB |
|
|
|
counted_lock.py |
2475.4.1 | 17 years ago | Martin Pool | Start adding CountedLock class to partially replac | 2.7 KB |
|
|
|
debug.py |
3195.1.1 | 16 years ago | Andrew Bennetts | Always include timestamps in the trace file (i.e. | 1.6 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 |
3200.1.1 | 16 years ago | James Westby | Make pull --quiet more quiet. Fixes #185907. | 15.8 KB |
|
|
|
deprecated_graph.py |
2592.3.46 | 17 years ago | Robert Collins | Merge knits branch. | 6 KB |
|
|
|
diff.py |
3164.1.1 | 16 years ago | Ian Clatworthy | diff without arguments means the current tree, not | 36.7 KB |
|
|
|
dirstate.py |
3221.1.5 | 16 years ago | Martin Pool | Fix incorrect indent in dirstate error handling | 123 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 |
3136.1.10 | 16 years ago | Aaron Bentley | Clean error if filesystem does not support hard-li | 66.6 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 |
3184.1.9 | 16 years ago | Robert Collins | * ``Repository.get_data_stream`` is now deprecate | 16.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 |
3211.5.1 | 16 years ago | Robert Collins | Change the smart server get_parents method to take | 29.8 KB |
|
|
|
hashcache.py |
2255.2.149 | 17 years ago | Robert Collins | Crufty but existing _iter_changes implementation f | 10.5 KB |
|
|
|
help.py |
2762.1.1 | 17 years ago | Ian Clatworthy | (Daniel Watkins) teach bzr help to recognize alias | 5.7 KB |
|
|
|
hooks.py |
2553.1.3 | 17 years ago | Robert Collins | Increase docs in response to review feedback. | 2.3 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 |
3099.3.3 | 16 years ago | John Arbash Meinel | Deprecate get_parents() in favor of get_parent_map | 57.6 KB |
|
|
|
info.py |
3152.2.2 | 16 years ago | Robert Collins | The bzrdir format registry now accepts an ``alias` | 16.4 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 |
1963.2.6 | 18 years ago | Robey Pointer | pychecker is on crack; go back to using 'is None'. | 5.3 KB |
|
|
|
inventory.py |
3201.1.1 | 16 years ago | jameinel | Fix bug #185458, switch from NFKC to NFC and add t | 53.5 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 |
3218.1.1 | 16 years ago | Robert Collins | Reduce index query pressure for text construction | 110 KB |
|
|
|
lazy_import.py |
1551.18.22 | 17 years ago | Aaron Bentley | Fix exception when ScopeReplacer is assigned to be | 15.5 KB |
|
|
|
lazy_regex.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 3.7 KB |
|
|
|
lock.py |
2872.5.1 | 17 years ago | Martin Pool | Avoid internal error tracebacks on failure to lock | 16.1 KB |
|
|
|
lockable_files.py |
3107.2.1 | 16 years ago | John Arbash Meinel | Fix LockableFiles to not use modes that allow the | 13.7 KB |
|
|
|
lockdir.py |
2872.5.1 | 17 years ago | Martin Pool | Avoid internal error tracebacks on failure to lock | 23.5 KB |
|
|
|
log.py |
3063.3.4 | 16 years ago | John Arbash Meinel | [merge] bzr.dev 3079 | 31.5 KB |
|
|
|
lru_cache.py |
2998.2.1 | 17 years ago | John Arbash Meinel | Implement LRUCache.get() which acts like dict.get( | 7.8 KB |
|
|
|
lsprof.py |
2911.6.4 | 17 years ago | Blake Winton | Fix test failures | 8.7 KB |
|
|
|
mail_client.py |
3042.1.1 | 17 years ago | Lukáš Lalinský | Make mail-to address in ``bzr send`` optional for | 11.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 |
3144.5.2 | 16 years ago | Aaron Bentley | Merge with fix-conflict-handling | 60.4 KB |
|
|
|
merge3.py |
1551.10.38 | 17 years ago | Aaron Bentley | merge3 auto-detects line endings for conflict mark | 14.1 KB |
|
|
|
merge_directive.py |
1551.19.20 | 16 years ago | Aaron Bentley | Updates from review | 22 KB |
|
|
|
missing.py |
2490.2.33 | 17 years ago | Aaron Bentley | Disable topological sorting of get_ancestry where | 5.2 KB |
|
|
|
msgeditor.py |
3004.1.4 | 17 years ago | Daniel Watkins | Modified fix as suggested by John on-list. | 9.5 KB |
|
|
|
multiparent.py |
2839.6.3 | 17 years ago | Alexander Belchenko | merge bzr.dev | 23.6 KB |
|
|
|
mutabletree.py |
2929.2.1 | 17 years ago | Robert Collins | * Commit updates the state of the working tree via | 21.7 KB |
|
|
|
option.py |
3144.3.1 | 16 years ago | Aaron Bentley | Implement LCA merge, with problematic conflict mar | 20.3 KB |
|
|
|
osutils.py |
3136.1.8 | 16 years ago | Aaron Bentley | Merge with bzr.dev | 45.3 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 |
1551.18.9 | 17 years ago | Aaron Bentley | Merge from bzr.dev | 12.9 KB |
|
|
|
patiencediff.py |
2781.1.1 | 17 years ago | Martin Pool | merge cpatiencediff from Lukas | 5.6 KB |
|
|
|
plugin.py |
3193.7.11 | 16 years ago | Alexander Belchenko | merge bzr.dev; update patch for 1.3 | 14 KB |
|
|
|
progress.py |
3006.3.5 | 16 years ago | Robert Collins | Merge to fix conflicts. | 17.7 KB |
|
|
|
reconcile.py |
3036.1.3 | 17 years ago | Robert Collins | Privatise VersionedFileChecker. | 20.5 KB |
|
|
|
reconfigure.py |
2796.2.32 | 16 years ago | Aaron Bentley | Preserve tags converting from lightweight checkout | 10.5 KB |
|
|
|
registry.py |
2745.5.3 | 17 years ago | Robert Collins | * Move transport logging into a new transport clas | 8.3 KB |
|
|
|
remote.py |
3221.3.3 | 16 years ago | Robert Collins | * Hook up the new remote method ``RemoteBzrDir.fi | 60.8 KB |
|
|
|
repository.py |
3221.3.4 | 16 years ago | Robert Collins | Integrate bzr.dev. | 127 KB |
|
|
|
revision.py |
3123.1.2 | 16 years ago | John Arbash Meinel | Aaron caught one more one_zero deprecation. | 16.7 KB |
|
|
|
revisionspec.py |
3010.1.12 | 17 years ago | Robert Collins | Lock branches while doing revision specification l | 25.6 KB |
|
|
|
revisiontree.py |
3008.1.15 | 16 years ago | Aaron Bentley | Make case_sensitive an aspect of the transform, no | 7.2 KB |
|
|
|
rio.py |
2911.6.1 | 17 years ago | Blake Winton | Change 'print >> f,'s to 'f.write('s. | 13.2 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 | 17 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 |
3193.3.2 | 16 years ago | Alexander Belchenko | better formatting of pending merges (short/no-shor | 8.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 |
3221.2.1 | 16 years ago | Martin Pool | Open 1.3 development | 11.6 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 |
2294.1.10 | 17 years ago | John Arbash Meinel | Switch all apis over to utf8 file ids. All tests p | 8.3 KB |
|
|
|
textfile.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.7 KB |
|
|
|
textinv.py |
2052.3.6 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 2078 | 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 |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.2 KB |
|
|
|
timestamp.py |
2425.6.2 | 17 years ago | Martin Pool | Make timestamps use existing format_date; document | 5.9 KB |
|
|
|
trace.py |
3193.6.8 | 16 years ago | Alexander Belchenko | merge bzr.dev; update for 1.3; $BZR_LOG used in tr | 15.3 KB |
|
|
|
transactions.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 6.5 KB |
|
|
|
transform.py |
3136.1.11 | 16 years ago | Aaron Bentley | Updates from review | 84 KB |
|
|
|
tree.py |
3144.3.1 | 16 years ago | Aaron Bentley | Implement LCA merge, with problematic conflict mar | 36.1 KB |
|
|
|
treebuilder.py |
1731.1.50 | 18 years ago | Aaron Bentley | Merge bzr.dev | 2.7 KB |
|
|
|
tsort.py |
3170.3.7 | 16 years ago | John Arbash Meinel | update MergeSorter.__init__() docstring | 30.3 KB |
|
|
|
tuned_gzip.py |
2592.3.143 | 17 years ago | Robert Collins | Merge more bzr.dev goodness. | 14.4 KB |
|
|
|
uncommit.py |
2598.5.4 | 17 years ago | Aaron Bentley | Restore original Branch.last_revision behavior, fi | 3.8 KB |
|
|
|
upgrade.py |
1910.2.12 | 18 years ago | Aaron Bentley | Implement knit repo format 2 | 3.2 KB |
|
|
|
urlutils.py |
3139.2.1 | 16 years ago | Alexander Belchenko | bugfix #90847: fix problem with parent location on | 22.2 KB |
|
|
|
version.py |
2911.6.3 | 17 years ago | Blake Winton | Implemented suggestions from John Arbash Meinel. | 3.8 KB |
|
|
|
versionedfile.py |
3174 | 16 years ago | Canonical.com Patch Queue Manager | (andrew) Add Smart request that can stream revisio | 31.4 KB |
|
|
|
weave.py |
2535.4.25 | 16 years ago | Andrew Bennetts | Merge from bzr.dev. | 42.8 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 |
2911.6.4 | 17 years ago | Blake Winton | Fix test failures | 5.5 KB |
|
|
|
win32utils.py |
3023.1.2 | 17 years ago | Alexander Belchenko | Martin's review. | 10.1 KB |
|
|
|
workingtree.py |
3136.1.8 | 16 years ago | Aaron Bentley | Merge with bzr.dev | 115 KB |
|
|
|
workingtree_4.py |
3136.1.10 | 16 years ago | Aaron Bentley | Clean error if filesystem does not support hard-li | 109 KB |
|
|
|
xml4.py |
2889.1.1 | 17 years ago | Robert Collins | * The class ``bzrlib.repofmt.knitrepo.KnitReposito | 6.4 KB |
|
|
|
xml5.py |
2917.2.1 | 17 years ago | John Arbash Meinel | Fix bug #152360. The xml5 serializer should be usi | 17.7 KB |
|
|
|
xml6.py |
2889.1.1 | 17 years ago | Robert Collins | * The class ``bzrlib.repofmt.knitrepo.KnitReposito | 2.7 KB |
|
|
|
xml7.py |
2255.2.152 | 17 years ago | Martin Pool | (broken) merge aaron's workingtree format changes | 1.6 KB |
|
|
|
xml_serializer.py |
3169.2.2 | 16 years ago | Robert Collins | Add a test to Repository.deserialise_inventory tha | 6.4 KB |
|
|