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

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

Rev	Summary	Authors	Date
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
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	15 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	15 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	15 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	15 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	15 years ago

Older »