/brz/remove-bazaar : changes

» Changes from revision 4597.2.29

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 4597.2.29 to 4597.2.10

expand all

Rev	Summary	Authors	Date
4597.2.29	Fixed as per Andrew's review comments. Fixed as per Andrew's review comments. * bzrlib/conflicts.py: (ContentsConflict._take_it_with_cleanups): Use OperationWithCleanups to ensure a clean error handling.	Vincent Ladeuil	15 years ago
4597.2.28	Use assertLength where appropriate. Use assertLength where appropriate.	Vincent Ladeuil	15 years ago
4597.2.27	Address some Andrew's review points. Address some Andrew's review points. * bzrlib/conflicts.py: (ContentsConflict._take_it): Use a better parameter name to avoid confusion. * NEWS: Fix typos.	Vincent Ladeuil	15 years ago
4597.2.26	Fix bug #529968 by renaming the kept file on content conflic... Fix bug #529968 by renaming the kept file on content conflicts. * bzrlib/conflicts.py: (ContentsConflict._take_it): Helper to resolve the conflict, factored out of the two symmetric cases. Use a tree transform to transparently handle more cases. (ContentsConflict.action_take_this, ContentsConflict.action_take_other): * bzrlib/tests/test_conflicts.py: (load_tests): Start parametrizing tests. (content_conflict_scenarios): First scenarios for ContenConflict. (TestResolveContentConflicts.setUp): Actions are parameters. (TestResolveContentConflicts.test_resolve_taking_this, TestResolveContentConflicts.test_resolve_taking_other): Finer checks are parameters. (TestResolveContentConflicts._get_actions) (TestResolveContentConflicts._get_check): Helpers. (TestResolveContentConflicts.do_modify_file, TestResolveContentConflicts.do_delete_file): Specific actions. (TestResolveContentConflicts.check_file_has_more_content, TestResolveContentConflicts.check_file_doesnt_exist): Specific checks.	Vincent Ladeuil	15 years ago
4597.2.25	Reproduce bug #529968. Reproduce bug #529968. * bzrlib/tests/test_conflicts.py: (OldTestResolveContentConflicts): Remove blackbox tests. (TestResolveContentConflicts.test_resolve_taking_this): Ensure we end up with the right path for the file when the conflict is resolved. (TestResolveContentConflicts.test_resolve_taking_other): Ensure we end up with no file after the conflict is resolved.	Vincent Ladeuil	15 years ago
4597.2.24	Translate one more test. Translate one more test. * bzrlib/tests/test_conflicts.py: (TestResolveContentConflicts): Rewrite test_resolve_taking_other as a whitebox test, refactoring common code.	Vincent Ladeuil	15 years ago
4597.2.23	Start translating blackbox tests into whitebox ones. Start translating blackbox tests into whitebox ones. * bzrlib/tests/test_conflicts.py: (TestResolveContentConflicts): Rewrite test_resolve_taking_this as a whitebox test.	Vincent Ladeuil	15 years ago
4597.2.22	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.21	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.20	Catch-up with bzr.dev renaming the help topic Catch-up with bzr.dev renaming the help topic	Vincent Ladeuil	15 years ago
4597.2.19	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.18	Remove spurious change. Remove spurious change.	Vincent Ladeuil	15 years ago
4597.2.17	Fix references in the spanish indices Fix references in the spanish indices	Vincent Ladeuil	15 years ago
4597.2.16	Put the spanish conflict help topic in the right place Put the spanish conflict help topic in the right place	Vincent Ladeuil	15 years ago
4597.2.15	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.14	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.13	merge bzr.dev into cleanup merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
4597.2.12	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	16 years ago
4597.2.11	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	16 years ago
4597.2.10	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	16 years ago

Older »