- Committer: Canonical.com Patch Queue Manager
- Date: 2007-03-09 22:57:21 UTC
- mfrom: (1551.12.48 mergedirective)
- Revision ID: pqm@pqm.ubuntu.com-20070309225721-d395866527ca9a47
Add support for merge directives
| 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 | 19 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 |
|
||
|
repofmt
|
2241.1.1 | 17 years ago | Martin Pool | Change RepositoryFormat to use a Registry rather t |
|
||
|
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 |
2323.1.1 | 17 years ago | Robert Collins | (robertc) Setup for 0.16 development. | 2.2 KB |
|
|
|
add.py |
2255.2.236 | 17 years ago | Martin Pool | Review cleanups: mostly updating or removing todo | 15 KB |
|
|
|
annotate.py |
2256.1.1 | 17 years ago | Robert Collins | (robertc) Merge new Branch.last_revision_info meth | 6.5 KB |
|
|
|
atomicfile.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 3.7 KB |
|
|
|
branch.py |
1551.12.44 | 17 years ago | Aaron Bentley | Add (set|get)_public_branch | 81.5 KB |
|
|
|
builtins.py |
1551.12.44 | 17 years ago | Aaron Bentley | Add (set|get)_public_branch | 133 KB |
|
|
|
bzrdir.py |
2255.2.226 | 17 years ago | Robert Collins | Get merge_nested finally working: change nested tr | 89.1 KB |
|
|
|
cache_utf8.py |
2255.7.95 | 17 years ago | Robert Collins | Add convenience utf8 decode routine for handling s | 4.2 KB |
|
|
|
check.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 8.1 KB |
|
|
|
cmd_version_info.py |
1996.3.26 | 18 years ago | John Arbash Meinel | Make cmd_version_info.py lazy import most other mo | 3.1 KB |
|
|
|
commands.py |
2304.2.1 | 17 years ago | Alexander Belchenko | Suppress IOError with errno=22 (Invalid argument) | 20.8 KB |
|
|
|
commit.py |
2255.2.220 | 17 years ago | Robert Collins | Fix failing detection of changes restricted to sub | 28.7 KB |
|
|
|
config.py |
2245.4.3 | 17 years ago | Alexander Belchenko | config.py: changing _auto_user_id() and config_dir | 29.5 KB |
|
|
|
conflicts.py |
2309.4.13 | 17 years ago | John Arbash Meinel | Conflicts go through Stanza so the need to be awar | 15.4 KB |
|
|
|
debug.py |
2095.5.2 | 18 years ago | Martin Pool | save commit message if commit fails (#32054) | 823 bytes |
|
|
|
decorators.py |
2230.2.6 | 17 years ago | John Arbash Meinel | Clean up the documentation and imports for decorat | 6.3 KB |
|
|
|
delta.py |
1551.10.25 | 17 years ago | Aaron Bentley | Make ChangeReporter private | 15.8 KB |
|
|
|
diff.py |
1551.12.35 | 17 years ago | Aaron Bentley | Merge bzr.dev | 18.9 KB |
|
|
|
dirstate.py |
2255.2.239 | 17 years ago | Robert Collins | Change from adler to crc checksums, as adler32 in | 104 KB |
|
|
|
errors.py |
1551.12.37 | 17 years ago | Aaron Bentley | Merge bzr.dev | 49.1 KB |
|
|
|
externalcommand.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.1 KB |
|
|
|
fetch.py |
2094.3.5 | 18 years ago | John Arbash Meinel | Fix imports to ensure modules are loaded before th | 15.6 KB |
|
|
|
generate_ids.py |
2294.1.10 | 17 years ago | John Arbash Meinel | Switch all apis over to utf8 file ids. All tests p | 4.3 KB |
|
|
|
globbing.py |
2298.8.2 | 17 years ago | Kent Gibson | Review fixes for lp86451 patch. | 7.8 KB |
|
|
|
gpg.py |
1551.12.15 | 17 years ago | Aaron Bentley | add header/trailer to fake clearsigned texts | 3.7 KB |
|
|
|
graph.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 5.9 KB |
|
|
|
hashcache.py |
2255.2.149 | 17 years ago | Robert Collins | Crufty but existing _iter_changes implementation f | 10.5 KB |
|
|
|
help.py |
1551.9.14 | 18 years ago | Aaron Bentley | Change topic to hidden-commands | 5.2 KB |
|
|
|
help_topics.py |
2270.1.1 | 17 years ago | John Arbash Meinel | [merge] James Westby, Aaron Bentley 'bzr help chec | 9.9 KB |
|
|
|
identitymap.py |
2294.1.10 | 17 years ago | John Arbash Meinel | Switch all apis over to utf8 file ids. All tests p | 3.3 KB |
|
|
|
ignores.py |
2298.8.1 | 17 years ago | Kent Gibson | Normalise ignore patterns to use '/' path separato | 5.1 KB |
|
|
|
info.py |
2258.1.2 | 17 years ago | Robert Collins | New version of gather_stats which gathers aggregat | 11.7 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 |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 51.4 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 |
2249.5.16 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2283 resolve conflicts in moved re | 76.9 KB |
|
|
|
lazy_import.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 14.6 KB |
|
|
|
lazy_regex.py |
2052.3.4 | 18 years ago | John Arbash Meinel | [merge] bzr.dev | 3.7 KB |
|
|
|
lock.py |
2255.10.2 | 17 years ago | John Arbash Meinel | Update to dirstate locking. Move all of WT4.lock_* | 9.5 KB |
|
|
|
lockable_files.py |
2249.5.11 | 17 years ago | John Arbash Meinel | Audit Branch to ensure utf8 revision ids. Requires | 13 KB |
|
|
|
lockdir.py |
1551.10.3 | 17 years ago | Aaron Bentley | Lock attempts don't treat permission problems as l | 17.3 KB |
|
|
|
log.py |
2221.4.11 | 17 years ago | Aaron Bentley | Merge bzr.dev | 19.5 KB |
|
|
|
lsprof.py |
1963.2.6 | 18 years ago | Robey Pointer | pychecker is on crack; go back to using 'is None'. | 6.2 KB |
|
|
|
memorytree.py |
1959.4.3 | 17 years ago | Aaron Bentley | Merge bzr.dev | 8.1 KB |
|
|
|
merge.py |
2255.2.226 | 17 years ago | Robert Collins | Get merge_nested finally working: change nested tr | 42.9 KB |
|
|
|
merge3.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 13.8 KB |
|
|
|
merge_directive.py |
1551.12.45 | 17 years ago | Aaron Bentley | Change format marker to not experimental | 9.6 KB |
|
|
|
missing.py |
2204.1.1 | 18 years ago | John Arbash Meinel | 'bzr missing -v' was showing adds as deletes. | 4.7 KB |
|
|
|
msgeditor.py |
2258.3.4 | 17 years ago | James Westby | Make the handling of the msgfile more sane. * C | 5.9 KB |
|
|
|
mutabletree.py |
2255.2.221 | 17 years ago | Robert Collins | Remove unused function. | 8.4 KB |
|
|
|
option.py |
1551.12.43 | 17 years ago | Aaron Bentley | Misc changes from review | 15.4 KB |
|
|
|
osutils.py |
2324.2.3 | 17 years ago | Dmitry Vasiliev | Fixed is_inside_* methods implementation | 41.9 KB |
|
|
|
patch.py |
1711.7.20 | 18 years ago | John Arbash Meinel | always close files, minor PEP8 cleanup | 3.3 KB |
|
|
|
patches.py |
2298.6.1 | 17 years ago | Johan Dahlberg | Fix bzrtools shelve command for removed lines begi | 12.6 KB |
|
|
patiencediff.py |
2100.2.1 | 18 years ago | wang | Replace python's difflib by patiencediff because t | 13.1 KB |
|
|
|
plugin.py |
2298.2.1 | 17 years ago | jml at canonical | Make set_plugins_path search user-specified direct | 8.4 KB |
|
|
|
progress.py |
2120.1.1 | 18 years ago | John Arbash Meinel | Use time.time() because time.clock() is CPU time, | 17.7 KB |
|
|
|
reconcile.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 14.1 KB |
|
|
|
registry.py |
2241.1.3 | 17 years ago | Martin Pool | Remove Registry.itervalues (comment from john) | 8.1 KB |
|
|
|
repository.py |
2255.2.230 | 17 years ago | Robert Collins | Update tree format signatures to mention introduci | 85.7 KB |
|
|
|
revision.py |
2229.2.3 | 17 years ago | Aaron Bentley | change reserved_id to is_reserved_id, add check_no | 16.8 KB |
|
|
|
revisionspec.py |
2220.2.20 | 17 years ago | Martin Pool | Tag methods now available through Branch.tags.add_ | 23.5 KB |
|
|
|
revisiontree.py |
2255.2.226 | 17 years ago | Robert Collins | Get merge_nested finally working: change nested tr | 6.5 KB |
|
|
|
rio.py |
1551.12.38 | 17 years ago | Aaron Bentley | Add docs for MergeDirective and RIO-patch function | 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 |
1996.3.14 | 18 years ago | John Arbash Meinel | lazy_import osutils and sign_my_commits Move doc t | 2.8 KB |
|
|
|
status.py |
1551.10.25 | 17 years ago | Aaron Bentley | Make ChangeReporter private | 8.8 KB |
|
|
|
symbol_versioning.py |
2234.1.1 | 17 years ago | Wouter van Heyst | 0.14rc1 has branch, bump bzr.dev version to 0.15 | 10.3 KB |
|
|
|
tag.py |
2220.2.42 | 17 years ago | Martin Pool | Tag command refuses to replace existing tags unles | 6.9 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 |
1551.12.48 | 17 years ago | Aaron Bentley | Fix patch time formatting | 5.3 KB |
|
|
|
trace.py |
2245.4.2 | 17 years ago | Alexander Belchenko | trace.py: open_tracefile(): win98-compatible detec | 10.4 KB |
|
|
|
transactions.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 6.5 KB |
|
|
|
transform.py |
1551.10.25 | 17 years ago | Aaron Bentley | Make ChangeReporter private | 61.9 KB |
|
|
|
tree.py |
2255.2.236 | 17 years ago | Martin Pool | Review cleanups: mostly updating or removing todo | 31 KB |
|
|
|
treebuilder.py |
1731.1.50 | 18 years ago | Aaron Bentley | Merge bzr.dev | 2.7 KB |
|
|
|
tsort.py |
2084 | 18 years ago | Canonical.com Patch Queue Manager | (Robert Collins) Output dotted decimal revision nu | 24.6 KB |
|
|
|
tuned_gzip.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 13.1 KB |
|
|
|
uncommit.py |
2246.1.3 | 17 years ago | Robert Collins | New branch hooks: post_push, post_pull, post_commi | 3.6 KB |
|
|
|
upgrade.py |
1910.2.12 | 18 years ago | Aaron Bentley | Implement knit repo format 2 | 3.2 KB |
|
|
|
urlutils.py |
2279.4.2 | 17 years ago | Alexander Belchenko | Don't do normpath after abspath, because this func | 18.1 KB |
|
|
|
version.py |
2234.7.1 | 17 years ago | Wouter van Heyst | (James Westby) Handle bzr residing in a non-workin | 2.4 KB |
|
|
|
versionedfile.py |
2249.5.12 | 17 years ago | John Arbash Meinel | Change the APIs for VersionedFile, Store, and some | 28.3 KB |
|
|
|
weave.py |
2229.2.3 | 17 years ago | Aaron Bentley | change reserved_id to is_reserved_id, add check_no | 53.2 KB |
|
|
|
weave_commands.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3 KB |
|
|
|
weavefile.py |
2024.1.1 | 18 years ago | John Arbash Meinel | When a weave file is empty, we should get WeaveFor | 5.5 KB |
|
|
|
win32utils.py |
2245.4.11 | 17 years ago | Alexander Belchenko | Small fixes after John's review; added NEWS entry | 7.3 KB |
|
|
|
workingtree.py |
1551.10.26 | 17 years ago | Aaron Bentley | Allow extract when tree is locked | 106 KB |
|
|
|
workingtree_4.py |
2255.2.236 | 17 years ago | Martin Pool | Review cleanups: mostly updating or removing todo | 102 KB |
|
|
|
xml4.py |
1852.16.5 | 17 years ago | John Arbash Meinel | [merge] bzr.dev 2255, resolve conflicts, update co | 6.6 KB |
|
|
|
xml5.py |
2255.2.170 | 17 years ago | Martin Pool | merge dirstate | 14.5 KB |
|
|
|
xml6.py |
2255.2.170 | 17 years ago | Martin Pool | merge dirstate | 2 KB |
|
|
|
xml7.py |
2255.2.152 | 17 years ago | Martin Pool | (broken) merge aaron's workingtree format changes | 1.6 KB |
|
|
|
xml_serializer.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 5.3 KB |
|
|