/brz/remove-bazaar : changes

» Changes from revision 4597.3.41

To get this branch, use:

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

From Revision 4597.3.41 to 4597.3.22

expand all

Rev	Summary	Authors	Date
4597.3.41	merge shell-like-tests into description resolving conflicts merge shell-like-tests into description resolving conflicts	Vincent Ladeuil	16 years ago
4597.3.40	Commit before moving the loom. Commit before moving the loom. * BRANCH.TODO: Mention one more bug.	Vincent Ladeuil	16 years ago
4597.3.39	Merge shell-like-tests into description resolving conflicts Merge shell-like-tests into description resolving conflicts	Vincent Ladeuil	16 years ago
4597.3.38	Moved Outline.txt into BRANCH.TODO. Moved Outline.txt into BRANCH.TODO.	Vincent Ladeuil	16 years ago
4597.3.37	Allows ui factories to query users for an integer. Allows ui factories to query users for an integer. * bzrlib/tests/test_ui.py: (TestTextUIFactory.test_text_ui_get_integer, CannedInputUIFactoryTests.test_canned_input_get_input): Tests. * bzrlib/ui/__init__.py: (UIFactory.get_integer): New definition. (CannedInputUIFactory.get_integer): Implementation. * bzrlib/ui/text.py: (TextUIFactory.get_integer): Implementation.	Vincent Ladeuil	16 years ago
4597.3.36	Fix imports and various cleanups in test_ui. Fix imports and various cleanups in test_ui.	Vincent Ladeuil	16 years ago
4597.3.35	Implement --interactive for NonDirectoryParent, sort of. Implement --interactive for NonDirectoryParent, sort of. * bzrlib/tests/test_conflicts.py: (TestResolveNonDirectoryParent): Tests for --interactive. * bzrlib/conflicts.py: (NonDirectoryParent): Add actions for --interactive, noting that we lack the relevant information :-/	Vincent Ladeuil	16 years ago
4597.3.34	Implement --interactive for ParentLoop. Implement --interactive for ParentLoop. * bzrlib/tests/test_conflicts.py: (TestResolveParentLoop): Tests for --interactive. * bzrlib/conflicts.py: (ParentLoop): Add actions for --interactive. Presumably the conflcit itself should have more info about the involved paths.	Vincent Ladeuil	16 years ago
4597.3.33	Implement --interactive for PathConflict. Implement --interactive for PathConflict. * bzrlib/tests/test_conflicts.py: (TestResolvePathConflict): Tests for --interactive. * bzrlib/conflicts.py: (PathConflict): Add actions for --interactive. (TextConflict): Ensure TextConflict is not solved like a PathConflict (this double the FIXME about inheritance or put weight behind the idea that we should define a ConflictSolver hierarchy independent from the Conflict hierarchy...).	Vincent Ladeuil	16 years ago
4597.3.32	Implement --interactive for DeletingParent noting the incons... Implement --interactive for DeletingParent noting the inconsistency. * bzrlib/tests/test_conflicts.py: (TestResolveDeletingParent): Tests for --interactive. * bzrlib/conflicts.py: (DeletingParent): Add actions for --interactive.	Vincent Ladeuil	16 years ago
4597.3.31	Implement --interactive for MissingParent. Implement --interactive for MissingParent. * bzrlib/tests/test_conflicts.py: (TestResolveMissingParent): Tests for --interactive. * bzrlib/conflicts.py: (MissingParent): Add actions for --interactive.	Vincent Ladeuil	16 years ago
4597.3.30	Light changes learned while starting to understand multiple ... Light changes learned while starting to understand multiple conflicts on the same path. * bzrlib/tests/test_conflicts.py: (TestResolveUnversionedParent): These tests creates multiple conflicts... * bzrlib/help_topics/en/conflicts.txt: Let's call a dir a dir not a file in 'Missing parent' doc. * bzrlib/conflicts.py: (_resolve_interactive): Clearer error message.	Vincent Ladeuil	16 years ago
4597.3.29	Fix bogus tests. Fix bogus tests. * bzrlib/tests/test_conflicts.py: (TestResolveUnversionedParent): Fix the tests, they weren't creating the right kind of conflict.	Vincent Ladeuil	16 years ago
4597.3.28	Implement --interactive for ContentsConflict. Implement --interactive for ContentsConflict. * bzrlib/tests/test_conflicts.py: (TestResolveContentConflicts): Tests for --interactive. * bzrlib/conflicts.py: (_resolve_interactive): Clean up the files creted to help resolving the conflict if any. (ContentsConflict): Add actions for --interactive.	Vincent Ladeuil	16 years ago
4597.3.27	(keep_mine, take_theirs) sounds clearer than (keep_this, kee... (keep_mine, take_theirs) sounds clearer than (keep_this, keep_other).	Vincent Ladeuil	16 years ago
4597.3.26	Tests passing for a minimal --interactive implementation. Tests passing for a minimal --interactive implementation. * bzrlib/tests/test_conflicts.py: (TestResolveDuplicatePaths.test_resolve_keeping_this, TestResolveDuplicatePaths.test_resolve_keeping_other): Use better action names. * bzrlib/tests/blackbox/test_conflicts.py: (TestResolve.test_resolve_interactive): Fix failing test by providing an exiting action. * bzrlib/conflicts.py: (_resolve_interactive): Minimal implementation.	Vincent Ladeuil	16 years ago
4597.3.25	Define --interactive usage. Define --interactive usage. * bzrlib/tests/blackbox/test_conflicts.py: (TestResolve.test_resolve_interactive_all, TestResolve.test_resolve_interactive_with_no_files, TestResolve.test_resolve_interactive_with_too_much_files): Test --interactive error cases. * bzrlib/conflicts.py: (cmd_resolve.run): Define --interactive usage as incompatible with --all and requiring a single file argument.	Vincent Ladeuil	16 years ago
4597.3.24	Fix imports in bzrlib/conflicts.py. Fix imports in bzrlib/conflicts.py.	Vincent Ladeuil	16 years ago
4597.3.23	Option test pass. Option test pass. * bzrlib/conflicts.py: (cmd_resolve): Add the interactive option.	Vincent Ladeuil	16 years ago
4597.3.22	More failing tests. More failing tests. * bzrlib/tests/blackbox/test_conflicts.py: (TestMixin): Renamed from TestBase, no need to contrain all daughter classes to inherit from TestCaseWithTransport. (TestResolve): Add a failing test for --interactive option.	Vincent Ladeuil	16 years ago

Older »