To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Jelmer Vernooij
- Date: 2020-09-02 11:51:19 UTC
- mto: (7490.40.109 work)
- Revision ID: jelmer@jelmer.uk-20200902115119-otuspc349t9rmhua
add test for git file merge.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
7490.62.3 | 5 years ago | Jelmer Vernooij | Move btree and remove references. | 4 KB |
|
|
|
test_add.py |
7121.2.2 | 7 years ago | Jelmer Vernooij | Merge trunk. | 11.3 KB |
|
|
|
test_added.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 2.6 KB |
|
|
|
test_alias.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 3.3 KB |
|
|
|
test_aliases.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 2.3 KB |
|
|
|
test_ancestry.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 4.5 KB |
|
|
|
test_annotate.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 11.3 KB |
|
|
|
test_big_file.py |
7490.28.3 | 5 years ago | Jelmer Vernooij | Use xrange on Python 2, to avoid running out of me | 3.2 KB |
|
|
|
test_bisect.py |
7490.53.1 | 5 years ago | Jelmer Vernooij | Move more files. | 10.1 KB |
|
|
|
test_bound_branches.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 14.1 KB |
|
|
|
test_branch.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 26.1 KB |
|
|
|
test_branches.py |
7490.62.3 | 5 years ago | Jelmer Vernooij | Move btree and remove references. | 3.7 KB |
|
|
|
test_break_lock.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 4.8 KB |
|
|
|
test_bundle_info.py |
7045.1.5 | 7 years ago | Jelmer Vernooij | Merge trunk. | 2 KB |
|
|
|
test_cat.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 8.5 KB |
|
|
|
test_cat_revision.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 3 KB |
|
|
|
test_check.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 4.6 KB |
|
|
|
test_checkout.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 8.1 KB |
|
|
|
test_clean_tree.py |
7045.1.5 | 7 years ago | Jelmer Vernooij | Merge trunk. | 3.9 KB |
|
|
|
test_clone.py |
7490.13.2 | 5 years ago | Jelmer Vernooij | Fix reference handling. | 2.5 KB |
|
|
|
test_command_encoding.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 4 KB |
|
|
|
test_commit.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 38.4 KB |
|
|
|
test_config.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 12 KB |
|
|
|
test_conflicts.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 4.3 KB |
|
|
|
test_cp.py |
7045.1.5 | 7 years ago | Jelmer Vernooij | Merge trunk. | 3.2 KB |
|
|
|
test_debug.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 2.2 KB |
|
|
|
test_deleted.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 1.2 KB |
|
|
|
test_diff.py |
7490.35.1 | 5 years ago | Jelmer Vernooij | Add test for bug 1880354. | 19.2 KB |
|
|
|
test_exceptions.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 7.2 KB |
|
|
|
test_export.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 17.5 KB |
|
|
|
test_export_pot.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 1.8 KB |
|
|
|
test_fetch_ghosts.py |
6973.7.5 | 7 years ago | Jelmer Vernooij | s/file/open. | 1.4 KB |
|
|
|
test_filesystem_cicp.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 10.9 KB |
|
|
|
test_filtered_view_ops.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 8 KB |
|
|
|
test_find_merge_base.py |
7045.3.1 | 7 years ago | Jelmer Vernooij | Fix another ~500 tests. | 1.5 KB |
|
|
|
test_help.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 7.7 KB |
|
|
|
test_hooks.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 2.9 KB |
|
|
|
test_ignore.py |
7490.61.1 | 5 years ago | Jelmer Vernooij | Rename BzrCommandError to CommandError. | 6.8 KB |
|
|
|
test_ignored.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 1.9 KB |
|
|
|
test_import.py |
6973.7.5 | 7 years ago | Jelmer Vernooij | s/file/open. | 2.9 KB |
|
|
|
test_info.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 44.7 KB |
|
|
|
test_init.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 9.6 KB |
|
|
|
test_inventory.py |
7358.1.1 | 6 years ago | Jelmer Vernooij | Add a --include-root flag to 'brz inventory'. | 4.4 KB |
|
|
|
test_join.py |
7404.3.3 | 5 years ago | Jelmer Vernooij | Merge follow-tree-references-list-files. | 4.2 KB |
|
|
|
test_link_tree.py |
6855.4.1 | 7 years ago | Jelmer Vernooij | Yet more bees. | 1.9 KB |
|
|
|
test_locale.py |
7290.47.2 | 5 years ago | Jelmer Vernooij | More improvements to make tests success with Pytho | 4.6 KB |
|
|
|
test_log.py |
7490.73.7 | 5 years ago | Jelmer Vernooij | Avoid using file ids in log. | 40.5 KB |
|
|
|
test_logformats.py |
7356.1.5 | 6 years ago | Jelmer Vernooij | Use more ExitStacks. | 4.1 KB |
|
|
|
test_lookup_revision.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 1.1 KB |
|
|
|
test_ls.py |
7490.62.3 | 5 years ago | Jelmer Vernooij | Move btree and remove references. | 8.7 KB |
|
|
|
test_lsprof.py |
7045.3.1 | 7 years ago | Jelmer Vernooij | Fix another ~500 tests. | 1.2 KB |
|
|
|
test_merge.py |
7490.129.3 | 5 years ago | Jelmer Vernooij | Split out bzr-specific Conflicts code. | 32.9 KB |
|
|
|
test_merge_directive.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 10.7 KB |
|
|
|
test_missing.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 9.8 KB |
|
|
|
test_mkdir.py |
6926.1.4 | 7 years ago | Jelmer Vernooij | remove mkdir_multi. | 1.9 KB |
|
|
|
test_modified.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 2.8 KB |
|
|
|
test_mv.py |
7211.7.2 | 7 years ago | Jelmer Vernooij | Fix move when file was in different location, rath | 20.7 KB |
|
|
|
test_nick.py |
6622.1.34 | 8 years ago | Jelmer Vernooij | Rename brzlib => breezy. | 3.6 KB |
|
|
|
test_non_ascii.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 21.8 KB |
|
|
|
test_outside_wt.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 3.2 KB |
|
|
|
test_pack.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 2.9 KB |
|
|
|
test_patch.py |
7336.1.1 | 6 years ago | Jelmer Vernooij | Print sensible error message when an invalid argum | 1.5 KB |
|
|
|
test_ping.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 1.7 KB |
|
|
|
test_plugins.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 3.1 KB |
|
|
|
test_pull.py |
7449.2.7 | 5 years ago | Jelmer Vernooij | Make remote branches mostly work. | 24.9 KB |
|
|
|
test_push.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 38.1 KB |
|
|
|
test_re_sign.py |
7206.4.1 | 7 years ago | Jelmer Vernooij | Move breezy.testament to breezy.bzr.testament. | 3.4 KB |
|
|
|
test_reconcile.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 2.8 KB |
|
|
|
test_reconfigure.py |
7385.2.1 | 6 years ago | Jelmer Vernooij | Rename init-repo to init-shared-repo. | 11.4 KB |
|
|
|
test_reference.py |
7490.62.3 | 5 years ago | Jelmer Vernooij | Move btree and remove references. | 3.9 KB |
|
|
|
test_remember_option.py |
7290.49.1 | 5 years ago | Jelmer Vernooij | Fix flake errors. | 7.3 KB |
|
|
|
test_remerge.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 5.3 KB |
|
|
|
test_remove.py |
7356.1.5 | 6 years ago | Jelmer Vernooij | Use more ExitStacks. | 10.4 KB |
|
|
|
test_remove_tree.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 6.9 KB |
|
|
|
test_repair_workingtree.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 3.7 KB |
|
|
|
test_resolve.py |
7490.129.3 | 5 years ago | Jelmer Vernooij | Split out bzr-specific Conflicts code. | 5.2 KB |
|
|
|
test_resolve_location.py |
7296.6.5 | 6 years ago | Jelmer Vernooij | Fix test. | 1.5 KB |
|
|
|
test_revert.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 7.5 KB |
|
|
|
test_revision_history.py |
7385.2.1 | 6 years ago | Jelmer Vernooij | Rename init-repo to init-shared-repo. | 2.9 KB |
|
|
|
test_revision_info.py |
7490.61.1 | 5 years ago | Jelmer Vernooij | Rename BzrCommandError to CommandError. | 5.3 KB |
|
|
|
test_revno.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 5.9 KB |
|
|
|
test_rmbranch.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 4 KB |
|
|
|
test_script.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 2.4 KB |
|
|
|
test_selftest.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 6.8 KB |
|
|
|
test_send.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 17.4 KB |
|
|
|
test_serve.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 18 KB |
|
|
|
test_shared_repository.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 6.1 KB |
|
|
|
test_shell_complete.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 1.6 KB |
|
|
|
test_shelve.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 5.5 KB |
|
|
|
test_sign_my_commits.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 3.8 KB |
|
|
|
test_split.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 2.6 KB |
|
|
|
test_status.py |
7490.129.3 | 5 years ago | Jelmer Vernooij | Split out bzr-specific Conflicts code. | 28.7 KB |
|
|
|
test_switch.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 24.8 KB |
|
|
|
test_tags.py |
7490.77.10 | 5 years ago | Jelmer Vernooij | Merge lp:brz/3.1 | 19.4 KB |
|
|
|
test_testament.py |
7490.49.1 | 5 years ago | Jelmer Vernooij | Move more bzr tests. | 2.3 KB |
|
|
|
test_too_much.py |
7490.61.1 | 5 years ago | Jelmer Vernooij | Rename BzrCommandError to CommandError. | 22.5 KB |
|
|
|
test_uncommit.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 11.2 KB |
|
|
|
test_unknowns.py |
7027.4.1 | 7 years ago | Jelmer Vernooij | Use StringIOWithEncoding on Python3. | 2 KB |
|
|
|
test_update.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 17.8 KB |
|
|
|
test_upgrade.py |
7385.2.1 | 6 years ago | Jelmer Vernooij | Rename init-repo to init-shared-repo. | 11.6 KB |
|
|
|
test_verify_signatures.py |
7490.51.1 | 5 years ago | Jelmer Vernooij | Move vfs ratchet functions to a separate function. | 3.7 KB |
|
|
|
test_version.py |
7344.2.1 | 6 years ago | Martin | Relocate the bzr log file out of $HOME Now under | 5.8 KB |
|
|
|
test_version_info.py |
7143.15.2 | 7 years ago | Jelmer Vernooij | Run autopep8. | 7.1 KB |
|
|
|
test_versioning.py |
7358.11.3 | 6 years ago | Jelmer Vernooij | TreeDelta holds TreeChange objects rather than tup | 6.1 KB |
|
|
|
test_view.py |
7490.62.3 | 5 years ago | Jelmer Vernooij | Move btree and remove references. | 4.9 KB |
|
|
|
test_whoami.py |
7344.1.1 | 6 years ago | Martin | Fix tests that need whoami not to be set Add over | 6.2 KB |
|
|