- Committer: Aaron Bentley
- Date: 2007-06-25 20:25:38 UTC
- mto: (2520.5.2 bzr.mpbundle)
- Revision ID: abentley@panoramicfeedback.com-20070625202538-j0k4t5akruv04e79
Fix lock handling in merge directives
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1551.15.30 | 17 years ago | Aaron Bentley | Write lsprof file name to stderr, not stdout | 6.1 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 |
2323.6.3 | 17 years ago | Martin Pool | bound-branch ui tests should now use the default b | 12.6 KB |
|
|
|
test_branch.py |
2387.1.1 | 17 years ago | Robert Collins | Remove the --basis parameter to clone etc. (Robert | 3.3 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_breakin.py |
2527.1.1 | 17 years ago | Martin Pool | Fix race in test_breakin_harder that can cause tes | 3.4 KB |
|
|
|
test_bundle.py |
2520.4.82 | 17 years ago | Aaron Bentley | Fix tests to stop expecting bundles to build trees | 4.2 KB |
|
|
|
test_cat.py |
2379.6.1 | 17 years ago | Alexander Belchenko | blackbox: test_cat_different_id: calling bzr as an | 4.3 KB |
|
|
|
test_cat_revision.py |
1551.13.18 | 17 years ago | Aaron Bentley | Add copyright notice | 2.1 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 |
2453.2.1 | 17 years ago | Martin Pool | Don't set the bugs property unless bugs are actual | 19.5 KB |
|
|
|
test_conflicts.py |
2120.7.5 | 17 years ago | Aaron Bentley | Merge bzr.dev | 4.2 KB |
|
|
|
test_debug.py |
2423.3.7 | 17 years ago | Martin Pool | Add BZR_SIGQUIT_PDB=0 option to disable breakin. | 1.3 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 |
2490.2.28 | 17 years ago | Aaron Bentley | Fix handling of null revision | 1.6 KB |
|
|
|
test_help.py |
2485.1.2 | 17 years ago | James Westby | Update with comments from review, thanks to John a | 4.4 KB |
|
|
|
test_ignore.py |
2318.2.3 | 17 years ago | Kent Gibson | merged bzr.dev | 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 |
2363.5.18 | 17 years ago | Aaron Bentley | Get all tests passing | 41.6 KB |
|
|
|
test_init.py |
2524.1.1 | 17 years ago | Aaron Bentley | Revert broken changes | 6.7 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 |
2466.9.1 | 17 years ago | Kent Gibson | add bzr log --limit | 13.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 | 18 years ago | Aaron Bentley | Get ls working on branches | 8.1 KB |
|
|
|
test_lsprof.py |
1551.15.31 | 17 years ago | Aaron Bentley | Add check for LSProf | 1.3 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 |
2520.4.81 | 17 years ago | Aaron Bentley | Fix blackbox tests | 9.4 KB |
|
|
|
test_missing.py |
2193.4.3 | 18 years ago | Alexander Belchenko | Use new API for testing | 5.2 KB |
|
|
|
test_mv.py |
2292.1.5 | 17 years ago | Marius Kruger | merge with bzr.dev | 13 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.52 | 17 years ago | Aaron Bentley | speling fix | 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 |
2292.1.34 | 17 years ago | Marius Kruger | Move "magically convert commands like 'remove abc' | 8 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 |
2512.2.4 | 17 years ago | Matthew Fuller | Rewrite revision-info blackbox tests to test: - S | 3.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 |
2477.1.6 | 17 years ago | Martin Pool | doc | 23.6 KB |
|
|
|
test_serve.py |
2018.5.147 | 17 years ago | Andrew Bennetts | Merge rename-SmartTransport branch. | 8.8 KB |
|
|
|
test_shared_repository.py |
2257.2.2 | 18 years ago | Wouter van Heyst | Actually test that `bzr init-repo --{no,}-trees` s | 3.7 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 | 18 years ago | Aaron Bentley | Remove get_format_*, make FormatRegistry.register_ | 1.5 KB |
|
|
|
test_status.py |
2408.1.7 | 17 years ago | Alexander Belchenko | Fix blackbox test_status_out_of_date: unlock WT be | 13.8 KB |
|
|
|
test_tags.py |
2348.2.1 | 17 years ago | Marien Zwart | Properly push tags if push creates a new branch. | 6 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 |
2472.1.2 | 17 years ago | John Arbash Meinel | Fix the one test that depended on 'aliases:\n' | 22.8 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 |
2323.5.19 | 17 years ago | Martin Pool | No upgrade recommendation on source when cloning | 7.9 KB |
|
|
|
test_version.py |
2347.1.1 | 17 years ago | John Arbash Meinel | (John Whitley) Print out the location of ~/.bazaar | 1.2 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 |
|
|