- Committer: Canonical.com Patch Queue Manager
- Date: 2006-07-02 19:48:18 UTC
- mfrom: (1551.7.13 Aaron's mergeable stuff)
- Revision ID: pqm@pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
Remerge doesn't clobber conflicts on other files
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1711.2.70 | 18 years ago | John Arbash Meinel | Add run_bzr_errors alongside run_bzr, to make it e | 5.7 KB |
|
|
|
test_add.py |
1757.2.1 | 18 years ago | Robert Collins | Add an explicit test that adding a missing file ba | 4.7 KB |
|
|
|
test_added.py |
1711.1.2 | 18 years ago | Robert Collins | 'bzr add' is now less verbose in telling you what | 1.7 KB |
|
|
|
test_aliases.py |
1740.5.6 | 18 years ago | Martin Pool | Clean up many exception classes. Errors indicatin | 1.8 KB |
|
|
|
test_ancestry.py |
1733.2.2 | 18 years ago | Michael Ellerman | Add optional location to ancestry and fix behaviou | 3.9 KB |
|
|
|
test_annotate.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 3.4 KB |
|
|
|
test_bound_branches.py |
1685.1.52 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1704 | 11.7 KB |
|
|
|
test_branch.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 4.4 KB |
|
|
|
test_break_lock.py |
1687.1.17 | 18 years ago | Robert Collins | Test break lock on old format branches. | 4.5 KB |
|
|
|
test_bundle.py |
1793.2.14 | 18 years ago | Aaron Bentley | Clean up bundle revision specification | 3.7 KB |
|
|
|
test_cat.py |
1185.50.9 | 18 years ago | John Arbash Meinel | [bug 3632] Matthieu Moy- bzr cat should default to | 1.6 KB |
|
|
|
test_checkout.py |
1704.2.14 | 18 years ago | Martin Pool | [merge] work from 0.8 fixes | 4 KB |
|
|
|
test_command_encoding.py |
1685.1.78 | 18 years ago | Wouter van Heyst | more code cleanup | 3.7 KB |
|
|
|
test_commit.py |
1711.2.60 | 18 years ago | John Arbash Meinel | Fix an empty commit to raise the right exception. | 11.8 KB |
|
|
|
test_conflicts.py |
1694.2.7 | 18 years ago | Martin Pool | [merge] bzr.dev | 3 KB |
|
|
|
test_diff.py |
1745 | 18 years ago | Canonical.com Patch Queue Manager | Speed up checkout by using existing revision text | 8.2 KB |
|
|
|
test_exceptions.py |
1740.5.7 | 18 years ago | Martin Pool | Add test for formatting of EPIPE | 1.4 KB |
|
|
|
test_export.py |
1185.61.5 | 18 years ago | Jamie Wilkinson | add test for directory export | 2.2 KB |
|
|
|
test_find_merge_base.py |
1534.7.158 | 18 years ago | Aaron Bentley | Merged John Meinel's integration | 1.3 KB |
|
|
|
test_help.py |
1616.1.15 | 18 years ago | Martin Pool | Handle 'bzr ?', etc. | 2.2 KB |
|
|
|
test_ignored.py |
1713.3.1 | 18 years ago | Robert Collins | Smoke tests for tree.list_files and bzr ignored wh | 1.6 KB |
|
|
|
test_info.py |
1780.1.2 | 18 years ago | Robert Collins | (robertc)Partial refactoring of info tests to be m | 38.9 KB |
|
|
|
test_init.py |
1740.5.6 | 18 years ago | Martin Pool | Clean up many exception classes. Errors indicatin | 3.7 KB |
|
|
|
test_log.py |
1685.1.5 | 18 years ago | John Arbash Meinel | Merged test_log.py.moved into test_log.py | 8.9 KB |
|
|
|
test_logformats.py |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 2.8 KB |
|
|
|
test_merge.py |
1752 | 18 years ago | Canonical.com Patch Queue Manager | (jam,mbp,wvh) Lots of updates to unicode,url,and e | 8.5 KB |
|
|
|
test_missing.py |
1685.1.80 | 18 years ago | Wouter van Heyst | more code cleanup | 4.5 KB |
|
|
|
test_non_ascii.py |
1816.1.1 | 18 years ago | Alexander Belchenko | blackbox test for non-ascii behaviour of missing c | 16.9 KB |
|
|
|
test_outside_wt.py |
1685.1.64 | 18 years ago | Martin Pool | [broken] test_cwd_log should expect a path, not a | 1.5 KB |
|
|
|
test_pull.py |
1740.5.9 | 18 years ago | Martin Pool | [merge] bzr.dev | 10.4 KB |
|
|
|
test_push.py |
1785.1.2 | 18 years ago | John Arbash Meinel | Push should only save the location if it can actua | 6.2 KB |
|
|
|
test_re_sign.py |
1563.2.31 | 18 years ago | Robert Collins | Convert Knit repositories to use knits. | 2.9 KB |
|
|
|
test_reconcile.py |
1692.1.1 | 18 years ago | Robert Collins | * Repository.reconcile now takes a thorough keywor | 2.5 KB |
|
|
|
test_remerge.py |
1551.7.13 | 18 years ago | Aaron Bentley | Switched from actual, expected to expected, actual | 4.7 KB |
|
|
|
test_remove.py |
1551.6.26 | 18 years ago | Aaron Bentley | Add support for remove --new | 2.5 KB |
|
|
|
test_revert.py |
1551.7.9 | 18 years ago | Aaron Bentley | Update for review comments | 5 KB |
|
|
|
test_revision_history.py |
1733.2.1 | 18 years ago | Michael Ellerman | Add an optional location parameter to the 'revisio | 3 KB |
|
|
|
test_revision_info.py |
1534.4.50 | 18 years ago | Robert Collins | Got the bzrdir api straightened out, plenty of ref | 4.5 KB |
|
|
|
test_revno.py |
1185.50.17 | 18 years ago | John Arbash Meinel | Forgot to add the test case | 1.5 KB |
|
|
|
test_selftest.py |
1685.1.69 | 18 years ago | Wouter van Heyst | merge bzr.dev 1740 | 5.8 KB |
|
|
|
test_shared_repository.py |
1694.2.7 | 18 years ago | Martin Pool | [merge] bzr.dev | 3.1 KB |
|
|
|
test_sign_my_commits.py |
1563.2.31 | 18 years ago | Robert Collins | Convert Knit repositories to use knits. | 3.8 KB |
|
|
|
test_status.py |
1685.1.80 | 18 years ago | Wouter van Heyst | more code cleanup | 9.1 KB |
|
|
|
test_too_much.py |
1824 | 18 years ago | Canonical.com Patch Queue Manager | (jam) add run_bzr_error, clean up remerge tests | 32.8 KB |
|
|
|
test_uncommit.py |
1614.2.15 | 18 years ago | Olaf Conradi | Merge bzr.dev | 2.5 KB |
|
|
|
test_update.py |
1587.1.14 | 18 years ago | Robert Collins | Make bound branch creation happen via 'checkout' | 5.2 KB |
|
|
|
test_upgrade.py |
1694.2.7 | 18 years ago | Martin Pool | [merge] bzr.dev | 7.6 KB |
|
|
|
test_versioning.py |
1508.1.19 | 18 years ago | Robert Collins | Give format3 working trees their own last-revision | 5.8 KB |
|
|