- Committer: Canonical.com Patch Queue Manager
- Date: 2006-09-06 12:20:16 UTC
- mfrom: (1551.8.23 Aaron's mergeable stuff)
- Revision ID: pqm@pqm.ubuntu.com-20060906122016-54ab3159023ef544
Improve conflict message for deleting directories with contents
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1955.2.2 | 18 years ago | John Arbash Meinel | Change the name of the test classes (test_lang => | 6.1 KB |
|
|
|
test_add.py |
1928.1.1 | 18 years ago | Alexander Belchenko | blackbox test for 'bzr add --dry-run' | 7.2 KB |
|
|
|
test_added.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 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 |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 3.9 KB |
|
|
|
test_annotate.py |
1948.4.31 | 18 years ago | John Arbash Meinel | fix bugs in the test_annonate.py suite, which was | 3.4 KB |
|
|
|
test_bound_branches.py |
1908.6.11 | 18 years ago | Robert Collins | Remove usage of tree.pending_merges(). | 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 |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 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 |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 1.6 KB |
|
|
|
test_checkout.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 4 KB |
|
|
|
test_command_encoding.py |
1685.1.78 | 18 years ago | Wouter van Heyst | more code cleanup | 3.7 KB |
|
|
|
test_commit.py |
1979.2.1 | 18 years ago | Robert Collins | (robertc) adds a convenience method "merge_from_br | 12.4 KB |
|
|
|
test_conflicts.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 3 KB |
|
|
|
test_diff.py |
1899.1.6 | 18 years ago | John Arbash Meinel | internal_diff always adds a trailing \n, make sure | 11.2 KB |
|
|
|
test_exceptions.py |
1904.2.5 | 18 years ago | Martin Pool | Fix format warning inside test suite and add test | 2 KB |
|
|
|
test_export.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 2.2 KB |
|
|
|
test_find_merge_base.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 1.3 KB |
|
|
|
test_help.py |
1861.2.7 | 18 years ago | Alexander Belchenko | merge bzr.dev | 2.2 KB |
|
|
|
test_ignore.py |
1836.1.31 | 18 years ago | John Arbash Meinel | Make set_user_ignores a private function, and upda | 2.8 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 |
1916 | 18 years ago | Canonical.com Patch Queue Manager | Add Branch.create_checkout method | 38.7 KB |
|
|
|
test_init.py |
1982.1.2 | 18 years ago | Alexander Belchenko | compatibility with win32 error messages format | 4.9 KB |
|
|
|
test_locale.py |
1982.1.3 | 18 years ago | Alexander Belchenko | fix forgotten import TestSkipped | 2.8 KB |
|
|
|
test_log.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 8.9 KB |
|
|
|
test_logformats.py |
1857.1.20 | 18 years ago | Aaron Bentley | Strip out all the EnumOption stuff | 2.8 KB |
|
|
|
test_ls.py |
1836.1.31 | 18 years ago | John Arbash Meinel | Make set_user_ignores a private function, and upda | 5.9 KB |
|
|
|
test_merge.py |
1908.6.11 | 18 years ago | Robert Collins | Remove usage of tree.pending_merges(). | 9.2 KB |
|
|
|
test_missing.py |
1685.1.80 | 18 years ago | Wouter van Heyst | more code cleanup | 4.5 KB |
|
|
|
test_mv.py |
1846.1.2 | 18 years ago | Wouter van Heyst | test mv more rigorously | 4.4 KB |
|
|
|
test_non_ascii.py |
1558.16.5 | 18 years ago | Aaron Bentley | Moy: change BZREMAIL to BZR_EMAIL | 17.5 KB |
|
|
|
test_outside_wt.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 3 KB |
|
|
|
test_pull.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 10.4 KB |
|
|
|
test_push.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 6.5 KB |
|
|
|
test_re_sign.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 2.9 KB |
|
|
|
test_reconcile.py |
1907.1.1 | 18 years ago | Aaron Bentley | Unshelved all changes except those related to remo | 2.5 KB |
|
|
|
test_remerge.py |
1857.1.20 | 18 years ago | Aaron Bentley | Strip out all the EnumOption stuff | 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 |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 3 KB |
|
|
|
test_revision_info.py |
1948.4.29 | 18 years ago | John Arbash Meinel | Remove a few more direct references to RevisionSpe | 4.5 KB |
|
|
|
test_revno.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 1.5 KB |
|
|
|
test_selftest.py |
1963.1.4 | 18 years ago | John Arbash Meinel | env_changes={} should be safe to remove variables | 10.5 KB |
|
|
|
test_shared_repository.py |
1857.1.20 | 18 years ago | Aaron Bentley | Strip out all the EnumOption stuff | 3.1 KB |
|
|
|
test_sign_my_commits.py |
1887.1.1 | 18 years ago | Adeodato Simó | Do not separate paragraphs in the copyright statem | 3.8 KB |
|
|
|
test_status.py |
1948.4.36 | 18 years ago | John Arbash Meinel | [merge] bzr.dev 1978 | 9.6 KB |
|
|
|
test_testament.py |
1930.2.1 | 18 years ago | John Arbash Meinel | Move out the blackbox testament tests into a real | 1.7 KB |
|
|
|
test_too_much.py |
1963.2.1 | 18 years ago | Robey Pointer | remove usage of has_key() | 26 KB |
|
|
|
test_uncommit.py |
1979.2.1 | 18 years ago | Robert Collins | (robertc) adds a convenience method "merge_from_br | 7.7 KB |
|
|
|
test_update.py |
1908.6.11 | 18 years ago | Robert Collins | Remove usage of tree.pending_merges(). | 7.9 KB |
|
|
|
test_upgrade.py |
1857.1.20 | 18 years ago | Aaron Bentley | Strip out all the EnumOption stuff | 7.6 KB |
|
|
|
test_versioning.py |
1852.10.4 | 18 years ago | Robert Collins | Merge bzr.dev. | 5.6 KB |
|
|
|
test_whoami.py |
1861.4.3 | 18 years ago | Matthieu Moy | Better test for BZREMAIL. Checks that BZREMAIL st | 5.1 KB |
|
|