~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 4597.3.52

Rev	Summary	Authors	Date
4597.3.51	Implement conflicts.ResolveActionOption. Implement conflicts.ResolveActionOption. * bzrlib/tests/test_conflicts.py: (TestResolveActionOption): Test the values for action option. * bzrlib/conflicts.py: (resolve_action_registry, ResolveActionOption): Define all conflict resolution actions.	Vincent Ladeuil	14 years ago
4597.3.50	Integrate most of BRANCH.TOTO into Integrate most of BRANCH.TOTO into bzrlib/help_topics/en/conflicts.txt, fix a typo in a test.	Vincent Ladeuil	14 years ago
4597.3.49	Cleanup and more notes. Cleanup and more notes.	Vincent Ladeuil	14 years ago
4597.3.48	Start cleaning BRANCH.TODO by pushing changes to either the ... Start cleaning BRANCH.TODO by pushing changes to either the python modules or the documentation.	Vincent Ladeuil	14 years ago
4597.3.47	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.46	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.45	Remove spurious import. Remove spurious import.	Vincent Ladeuil	14 years ago
4597.3.44	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.43	Cleanups, ready to record. Cleanups, ready to record. * bzrlib/tests/test_conflicts.py: Align with submitted refacorting. * BRANCH.TODO: Fix typo.	Vincent Ladeuil	14 years ago
4597.3.42	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	14 years ago
4597.3.41	merge shell-like-tests into description resolving conflicts merge shell-like-tests into description resolving conflicts	Vincent Ladeuil	14 years ago
4597.3.40	Commit before moving the loom. Commit before moving the loom. * BRANCH.TODO: Mention one more bug.	Vincent Ladeuil	15 years ago
4597.3.39	Merge shell-like-tests into description resolving conflicts Merge shell-like-tests into description resolving conflicts	Vincent Ladeuil	15 years ago
4597.3.38	Moved Outline.txt into BRANCH.TODO. Moved Outline.txt into BRANCH.TODO.	Vincent Ladeuil	15 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	15 years ago
4597.3.36	Fix imports and various cleanups in test_ui. Fix imports and various cleanups in test_ui.	Vincent Ladeuil	15 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	15 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	15 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	15 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	15 years ago

Older »