- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1551.12.37 | 17 years ago | Aaron Bentley | Merge bzr.dev | 5.5 KB |
|
|
|
test_add.py |
2255.2.176 | 17 years ago | Martin Pool | Merge dirstate and some small cleanups | 7.8 KB |
|
|
|
test_added.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.7 KB |
|
|
|
test_aliases.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.6 KB |
|
|
|
test_ancestry.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 3.9 KB |
|
|
|
test_annotate.py |
2182.3.12 | 18 years ago | John Arbash Meinel | Force the timezone properly during tests which loo | 5.5 KB |
|
|
|
test_bound_branches.py |
2255.2.208 | 17 years ago | Robert Collins | Remove more references to 'experimental' formats. | 12.6 KB |
|
|
|
test_branch.py |
2241.1.6 | 17 years ago | Martin Pool | Move Knit repositories into the submodule bzrlib.r | 4.4 KB |
|
|
|
test_break_lock.py |
2255.7.59 | 17 years ago | Robert Collins | Remove a break-lock test that was duplicating lowe | 4 KB |
|
|
|
test_bundle.py |
2178.4.5 | 18 years ago | Alexander Belchenko | Spell-checking (thanks to Aaron) | 4 KB |
|
|
|
test_cat.py |
2255.7.98 | 17 years ago | Robert Collins | Merge bzr.dev. | 4.2 KB |
|
|
|
test_checkout.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 4 KB |
|
|
|
test_command_encoding.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.7 KB |
|
|
|
test_commit.py |
2120.7.5 | 17 years ago | Aaron Bentley | Merge bzr.dev | 14.7 KB |
|
|
|
test_conflicts.py |
2120.7.5 | 17 years ago | Aaron Bentley | Merge bzr.dev | 4.2 KB |
|
|
|
test_debug.py |
2308.1.1 | 17 years ago | Martin Pool | Avoid false failure of test_dash_derror | 1.2 KB |
|
|
|
test_diff.py |
2324.1.2 | 17 years ago | Dmitry Vasiliev | Added test for bzr diff --prefix illegal_value | 12.1 KB |
|
|
|
test_exceptions.py |
1551.9.3 | 18 years ago | Aaron Bentley | Revert buggy apport changes | 2 KB |
|
|
|
test_export.py |
2099.1.1 | 18 years ago | Daniel Silverstone | Add source branch support to export command | 8.8 KB |
|
|
|
test_find_merge_base.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.3 KB |
|
|
|
test_help.py |
2245.7.1 | 17 years ago | James Westby | Add a help topic describing checkouts and how they | 3.5 KB |
|
|
|
test_ignore.py |
2298.8.3 | 17 years ago | Kent Gibson | Extended test cases to test bug 86451. | 4.3 KB |
|
|
|
test_ignored.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.6 KB |
|
|
|
test_info.py |
2255.2.201 | 17 years ago | Robert Collins | Test_info needed updating after freezing the meani | 38.4 KB |
|
|
|
test_init.py |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 5.9 KB |
|
|
|
test_inventory.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 4.3 KB |
|
|
|
test_join.py |
2255.2.235 | 17 years ago | Martin Pool | Add blackbox test that join gives clean error when | 3.9 KB |
|
|
|
test_locale.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.9 KB |
|
|
|
test_log.py |
1551.10.18 | 17 years ago | Aaron Bentley | Log works in local treeless branches (#84247) | 10.7 KB |
|
|
|
test_logformats.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 3.5 KB |
|
|
|
test_ls.py |
2215.3.3 | 17 years ago | Aaron Bentley | Get ls working on branches | 8.1 KB |
|
|
|
test_merge.py |
2297.1.1 | 17 years ago | Martin Pool | Pull now returns a PullResult rather than just an | 11.8 KB |
|
|
|
test_merge_directive.py |
1551.12.45 | 17 years ago | Aaron Bentley | Change format marker to not experimental | 4.6 KB |
|
|
|
test_missing.py |
2193.4.3 | 17 years ago | Alexander Belchenko | Use new API for testing | 5.2 KB |
|
|
|
test_mv.py |
2255.2.234 | 17 years ago | Robert Collins | Merge bzr.dev. | 13.4 KB |
|
|
|
test_nick.py |
2120.5.3 | 18 years ago | Alexander Belchenko | Fix year in copyrights | 1.4 KB |
|
|
|
test_non_ascii.py |
2220.2.39 | 17 years ago | Martin Pool | Pull also merges tags and warns if they conflict | 17.5 KB |
|
|
|
test_outside_wt.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3 KB |
|
|
|
test_pull.py |
2221.5.13 | 17 years ago | Dmitry Vasiliev | Fixed expected message in test | 10.8 KB |
|
|
|
test_push.py |
2220.2.38 | 17 years ago | Martin Pool | Tag conflicts from push go to stdout. Cleanup blac | 9.7 KB |
|
|
|
test_re_sign.py |
1551.12.36 | 17 years ago | Aaron Bentley | Fix failing tests | 3 KB |
|
|
|
test_reconcile.py |
2294.4.4 | 17 years ago | Vincent Ladeuil | Provide a better implementation for testing passwo | 2.5 KB |
|
|
|
test_remerge.py |
2067.3.3 | 18 years ago | Martin Pool | merge bzr.dev and reconcile several changes, also | 4.7 KB |
|
|
|
test_remove.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.5 KB |
|
|
|
test_remove_tree.py |
2127.2.3 | 18 years ago | Daniel Silverstone | Oops, fix the message up | 3.9 KB |
|
|
|
test_revert.py |
2255.2.231 | 17 years ago | Robert Collins | Add test showing reverts UI working as Aaron inten | 6.2 KB |
|
|
|
test_revision_history.py |
2052.3.1 | 18 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 3 KB |
|
|
|
test_revision_info.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 4.5 KB |
|
|
|
test_revno.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.5 KB |
|
|
|
test_selftest.py |
2326.1.1 | 17 years ago | John Arbash Meinel | (Vincent Ladeuil) Improved infrastructure for pass | 19.9 KB |
|
|
|
test_serve.py |
2309.2.5 | 17 years ago | Alexander Belchenko | test_bzr_connect_to_bzr_ssh: win32-compatibility | 8.8 KB |
|
|
|
test_shared_repository.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.1 KB |
|
|
|
test_sign_my_commits.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.8 KB |
|
|
|
test_split.py |
2100.3.17 | 17 years ago | Aaron Bentley | Remove get_format_*, make FormatRegistry.register_ | 1.5 KB |
|
|
|
test_status.py |
2255.7.97 | 17 years ago | Robert Collins | Teach delta.report_changes about unversioned files | 12.6 KB |
|
|
|
test_tags.py |
2255.2.211 | 17 years ago | Robert Collins | Remove knit2 repository format- it has never been | 5.4 KB |
|
|
|
test_testament.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 1.7 KB |
|
|
|
test_too_much.py |
2120.5.1 | 18 years ago | Alexander Belchenko | Added test for bug #66857 (autonick is urlencoded) | 22.7 KB |
|
|
|
test_uncommit.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 7.5 KB |
|
|
|
test_update.py |
2255.7.55 | 17 years ago | Robert Collins | Whitespace fix. | 8.3 KB |
|
|
|
test_upgrade.py |
2326.1.1 | 17 years ago | John Arbash Meinel | (Vincent Ladeuil) Improved infrastructure for pass | 7.1 KB |
|
|
|
test_version_info.py |
2030.1.4 | 18 years ago | John Arbash Meinel | Add a test that we can find the version info when | 4.9 KB |
|
|
|
test_versioning.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.6 KB |
|
|
|
test_whoami.py |
2052.3.2 | 18 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 5.1 KB |
|
|