~bzr/ubuntu/hardy/bzr/beta-ppa : changes

~bzr/ubuntu/hardy/bzr/beta-ppa » Changes from revision 3815.1829.11

From Revision 3815.1829.11 to 3815.1551.24

Rev	Summary	Authors	Date
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	Put NEWS entry under 2.2b3. Put NEWS entry under 2.2b3.	Vincent Ladeuil	14 years ago
3815.1829....	Fix wrong conflict resolution (thanks to test coverage...). Fix wrong conflict resolution (thanks to test coverage...).	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	transform.final_kind() now returns None instead of raising N... transform.final_kind() now returns None instead of raising NoSuchFile. * bzrlib/transform.py: (TreeTransformBase.final_kind): Just return None instead of raising NoSuchFile since all callers just do that while catching the exception. (TreeTransformBase._improper_versioning) (TreeTransformBase._executability_conflicts) (TreeTransformBase._duplicate_entries) (TreeTransformBase._parent_type_conflicts) (TreeTransformBase._any_contents, TreeTransformBase._to_file_data) (TreeTransform._generate_inventory_delta) (_PreviewTree._make_inv_entries, _PreviewTree.walkdirs): Fix call sites. * bzrlib/tests/test_transform.py: (TestTreeTransform.test_build): The single test needing a fix for final_kind returning None... * bzrlib/merge.py: (Merge3Merger.fix_root, Merge3Merger.fix_root) (Merge3Merger._merge_executable): Simplify final_kind() uses.	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
3815.1829....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
3815.1828....	Fix doc string. Fix doc string. * bzrlib/conflicts.py: (ContentsConflict): Is used for binary files too.	Vincent Ladeuil	15 years ago
3815.1826....	Simplify resolve_conflict_scenarios. Simplify resolve_conflict_scenarios. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Enhance readability.	Vincent Ladeuil	15 years ago
3815.1826....	Abstract the test class some more to address more conflict Abstract the test class some more to address more conflict types. This currently fails test_resolve_taking_other(dir_renamed,dir_deleted) because the conflict object doesn't record the file-id involved. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Renamed from content_conflict_scenarios because we basically want to use the same tests for various conflict types. (TestParametrizedResolveConflicts): Add more attributes. (TestParametrizedResolveConflicts.setUp): Create a dir for other types of conflicts. (TestParametrizedResolveConflicts.assertConflict): Use the conflict type parameter instead of requiring the method parameter. (TestParametrizedResolveConflicts.do_rename_dir, TestParametrizedResolveConflicts.check_dir_renamed, TestParametrizedResolveConflicts.do_delete_dir, TestParametrizedResolveConflicts.check_dir_doesnt_exist): More helpers.	Vincent Ladeuil	15 years ago
3815.1826....	Fix typos, tests passing. Fix typos, tests passing.	Vincent Ladeuil	15 years ago
3815.1826....	Each base scenario should be mirrored. Each base scenario should be mirrored. * bzrlib/tests/test_conflicts.py: (content_conflict_scenarios): Generate derived scenarios from base.	Vincent Ladeuil	15 years ago
3815.1826....	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	15 years ago
3815.1551....	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
3815.1551....	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
3815.1551....	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

Older »