- Committer: Robert Collins
- Date: 2006-09-04 08:00:00 UTC
- mto: (1981.1.1 integration)
- Revision ID: robertc@robertcollins.net-20060904080000-1152da5eed765694
(robertc) adds a convenience method "merge_from_branch" to WorkingTree.
| 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 |
|
||
|
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 |
1955.2.5 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1961 | 2.2 KB |
|
|
|
add.py |
1930.1.2 | 18 years ago | John Arbash Meinel | Alexander Belchenko: Fix add --dry-run | 14.2 KB |
|
|
|
annotate.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 3 KB |
|
|
|
atomicfile.py |
1755.3.11 | 18 years ago | John Arbash Meinel | Test that AtomicFile.closed is supported, but depr | 3.6 KB |
|
|
|
branch.py |
1948.4.36 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1978 | 53.6 KB |
|
|
|
builtins.py |
1948.4.36 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1978 | 104 KB |
|
|
|
bzrdir.py |
1551.8.20 | 18 years ago | Aaron Bentley | Fix BzrDir.create_workingtree for NULL_REVISION | 71.9 KB |
|
|
|
cache_utf8.py |
1934.1.11 | 18 years ago | John Arbash Meinel | Document why we use try/except rather than if None | 2.9 KB |
|
|
|
check.py |
1731.1.28 | 18 years ago | Aaron Bentley | Merge from bzr.dev | 8.1 KB |
|
|
|
commands.py |
1948.4.36 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1978 | 19.5 KB |
|
|
|
commit.py |
1908.6.6 | 18 years ago | Robert Collins | Merge updated set_parents api. | 22.2 KB |
|
|
|
config.py |
1558.16.5 | 18 years ago | Aaron Bentley | Moy: change BZREMAIL to BZR_EMAIL | 25 KB |
|
|
|
conflicts.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 13.6 KB |
|
|
|
decorators.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 1.7 KB |
|
|
|
delta.py |
1874.1.10 | 18 years ago | Carl Friedrich Bolz | Merge bzr.dev. | 11.6 KB |
|
|
|
diff.py |
1959.1.1 | 18 years ago | Marien Zwart | merge. | 17.4 KB |
|
|
|
errors.py |
1979.2.1 | 18 years ago | Robert Collins | (robertc) adds a convenience method "merge_from_br | 32.1 KB |
|
|
|
externalcommand.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 2.1 KB |
|
|
|
fetch.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 11.8 KB |
|
|
|
gpg.py |
1551.8.11 | 18 years ago | Aaron Bentley | Clear terminal before signing | 3.2 KB |
|
|
|
graph.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 5.9 KB |
|
|
|
hashcache.py |
1908.4.9 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1934 | 10.1 KB |
|
|
|
help.py |
1857.1.11 | 18 years ago | Aaron Bentley | Rough merge of bzr.dev | 4.9 KB |
|
|
|
identitymap.py |
1563.2.25 | 18 years ago | Robert Collins | Merge in upstream. | 3.3 KB |
|
|
|
ignores.py |
1711.2.105 | 18 years ago | John Arbash Meinel | Updated doc | 5 KB |
|
|
|
info.py |
1907.1.9 | 18 years ago | Aaron Bentley | Avoid generating unnecessary list | 12 KB |
|
|
|
inter.py |
1852.11.3 | 18 years ago | Robert Collins | Fix typo in inter.py. | 4.2 KB |
|
|
|
intset.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 5.3 KB |
|
|
|
inventory.py |
1711.9.11 | 18 years ago | John Arbash Meinel | change return foo in bar to return (foo in bar) | 46.7 KB |
|
|
|
iterablefile.py |
1551.6.38 | 18 years ago | Aaron Bentley | Move doctest import to increase speed | 7.7 KB |
|
|
|
knit.py |
1711.9.11 | 18 years ago | John Arbash Meinel | change return foo in bar to return (foo in bar) | 73.8 KB |
|
|
|
lock.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 9.1 KB |
|
|
|
lockable_files.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 12.6 KB |
|
|
|
lockdir.py |
1955.1.1 | 18 years ago | John Arbash Meinel | LockDir can create the root directory if it fails | 15.5 KB |
|
|
|
log.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 17.7 KB |
|
|
|
lsprof.py |
1711.2.124 | 18 years ago | John Arbash Meinel | Use sys.modules.items() to prevent running into si | 6.2 KB |
|
|
|
merge.py |
1979.2.1 | 18 years ago | Robert Collins | (robertc) adds a convenience method "merge_from_br | 38.7 KB |
|
|
|
merge3.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 13.8 KB |
|
|
|
missing.py |
1852.10.3 | 18 years ago | Robert Collins | Remove all uses of compare_trees and replace with | 4 KB |
|
|
|
msgeditor.py |
1963.2.1 | 18 years ago | Robey Pointer | remove usage of has_key() | 5.4 KB |
|
|
|
option.py |
1948.4.33 | 18 years ago | John Arbash Meinel | Switch from get_revision_spec() to RevisionSpec.fr | 10.5 KB |
|
|
|
osutils.py |
1955.2.3 | 18 years ago | John Arbash Meinel | Change error message text | 29.6 KB |
|
|
|
patch.py |
1711.7.20 | 18 years ago | John Arbash Meinel | always close files, minor PEP8 cleanup | 3.3 KB |
|
|
|
patches.py |
1770.1.1 | 18 years ago | Aaron Bentley | Ignore lines that start with '#' in patch parser | 12.4 KB |
|
|
patiencediff.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 13.1 KB |
|
|
|
plugin.py |
1900.1.1 | 18 years ago | Robert Collins | Merge Johns bug 51810 fixup. | 6.2 KB |
|
|
|
progress.py |
1843.3.7 | 18 years ago | John Arbash Meinel | new env var 'BZR_PROGRESS_BAR' to select the exact | 17.9 KB |
|
|
|
reconcile.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 14.1 KB |
|
|
|
repository.py |
1910.2.9 | 18 years ago | Aaron Bentley | Inroduce assertDeprecated, and use it to test old | 89.1 KB |
|
|
|
revision.py |
1711.9.11 | 18 years ago | John Arbash Meinel | change return foo in bar to return (foo in bar) | 16.3 KB |
|
|
|
revisionspec.py |
1948.4.35 | 18 years ago | John Arbash Meinel | Move the _revno_regex to a more logical location | 16.9 KB |
|
|
|
revisiontree.py |
1910.2.6 | 18 years ago | Aaron Bentley | Update for merge review, handle deprecations | 3.9 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 |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 2.7 KB |
|
|
|
status.py |
1908.6.12 | 18 years ago | Robert Collins | Teach status to handle the base revision being a g | 7.5 KB |
|
|
|
symbol_versioning.py |
1711.9.6 | 18 years ago | John Arbash Meinel | Add a deprecation symbol for bzr-0.11 | 7.5 KB |
|
|
|
testament.py |
1930.2.2 | 18 years ago | John Arbash Meinel | Avoid needless encode/decode. Only encode at the b | 7.6 KB |
|
|
|
textfile.py |
1711.7.24 | 18 years ago | John Arbash Meinel | check_text_file was leaving the file handle open, | 1.7 KB |
|
|
|
textinv.py |
1907.1.8 | 18 years ago | Aaron Bentley | Remove is_root | 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 |
1861.2.6 | 18 years ago | Alexander Belchenko | branding: change Bazaar-NG to Bazaar | 1.2 KB |
|
|
|
trace.py |
1948.1.9 | 18 years ago | John Arbash Meinel | Change mutter() so that it doesn't try so hard to | 9.8 KB |
|
|
|
transactions.py |
1711.9.11 | 18 years ago | John Arbash Meinel | change return foo in bar to return (foo in bar) | 6.5 KB |
|
|
|
transform.py |
1977 | 18 years ago | Canonical.com Patch Queue Manager | Behave reasonably when creating a checkout in a di | 52.3 KB |
|
|
|
tree.py |
1711.9.11 | 18 years ago | John Arbash Meinel | change return foo in bar to return (foo in bar) | 14.3 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 |
1908.4.15 | 18 years ago | John Arbash Meinel | comment on tuned_gzip.readlines() functionality. | 13.1 KB |
|
|
|
uncommit.py |
1908.6.14 | 18 years ago | Robert Collins | Merge bzr.dev. | 3 KB |
|
|
|
upgrade.py |
1558.7.2 | 18 years ago | Aaron Bentley | Upgrade works in repositories | 3 KB |
|
|
|
urlutils.py |
1861.2.6 | 18 years ago | Alexander Belchenko | branding: change Bazaar-NG to Bazaar | 17.4 KB |
|
|
|
version.py |
1951.1.1 | 18 years ago | Andrew Bennetts | Make test_bench_history and _get_bzr_source_tree t | 2.3 KB |
|
|
|
versionedfile.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 27.2 KB |
|
|
|
weave.py |
1711.9.11 | 18 years ago | John Arbash Meinel | change return foo in bar to return (foo in bar) | 53 KB |
|
|
|
weave_commands.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 3 KB |
|
|
|
weavefile.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 5.4 KB |
|
|
|
win32console.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 1.3 KB |
|
|
|
workingtree.py |
1979.2.1 | 18 years ago | Robert Collins | (robertc) adds a convenience method "merge_from_br | 77.8 KB |
|
|
|
xml4.py |
1852.6.10 | 18 years ago | Robert Collins | Merge bzr.dev. | 6.6 KB |
|
|
|
xml5.py |
1934.1.20 | 18 years ago | John Arbash Meinel | Document why we aren't caching file ids at the mom | 12 KB |
|
|
|
xml_serializer.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 4.8 KB |
|
|