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

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

Rev	Summary	Authors	Date
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
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	15 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	15 years ago
4597.3.24	Fix imports in bzrlib/conflicts.py. Fix imports in bzrlib/conflicts.py.	Vincent Ladeuil	15 years ago
4597.3.23	Option test pass. Option test pass. * bzrlib/conflicts.py: (cmd_resolve): Add the interactive option.	Vincent Ladeuil	15 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	15 years ago
4597.3.21	Cleanup test classes. Cleanup test classes. * bzrlib/tests/blackbox/test_conflicts.py: (TestBase): A new helper. (TestConflicts, TestResolve): One class for each command. (TestResolve.test_resolve_in_subdir): No need to restore the current dir.	Vincent Ladeuil	15 years ago
4597.3.20	Fix imports in bzrlib/tests/blackbox/test_conflicts.py. Fix imports in bzrlib/tests/blackbox/test_conflicts.py.	Vincent Ladeuil	15 years ago
4597.3.19	Some failing tests. Some failing tests. * bzrlib/tests/test_conflicts.py: (TestResolveDuplicatePaths.test_resolve_keeping_this): Add explicit failing tests for resolve --interactive. * Outline.txt: Link more bugs.	Vincent Ladeuil	15 years ago
4597.3.18	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.17	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.16	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.15	Update to new shell-like tests syntax. Update to new shell-like tests syntax.	Vincent Ladeuil	15 years ago
4597.3.14	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.13	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.12	Start writing tests for all expected conflict resolution act... Start writing tests for all expected conflict resolution actions. * bzrlib/tests/test_conflicts.py: Add shel--like tests for all conflict types. * Outline.txt: Some updates.	Vincent Ladeuil	15 years ago
4597.3.11	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.10	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.9	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.8	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago