~bzr-pqm/bzr/bzr.dev

From Revision 4597.10.14 to 4597.8.5

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
4597.10.14		Some more cleanup and typos. Some more cleanup and typos.	Vincent Ladeuil	14 years ago
4597.10.13		Turns scenarios() methods into static methods. Turns scenarios() methods into static methods.	Vincent Ladeuil	14 years ago
4597.10.12		Some more doc. Some more doc.	Vincent Ladeuil	14 years ago
4597.10.11		Turn mirror_scenarios into a simple function. Turn mirror_scenarios into a simple function. * bzrlib/tests/test_conflicts.py: (mirror_scenarios): Make it a simple function.	Vincent Ladeuil	14 years ago
4597.10.10		Fix typo. Fix typo.	Vincent Ladeuil	14 years ago
4597.10.9		More doc. More doc.	Vincent Ladeuil	14 years ago
4597.10.8		Separate actions and conflict attributes. Separate actions and conflict attributes. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts): Separate actions from additional info needed to check the conflict objects, since this is specific to daughter classes, this is delegated. Reorder the dicts used to define the scenarios. (TestParametrizedResolveConflicts.scenarios): Document the scenario structure. (TestParametrizedResolveConflicts.setUp): Extract just the actions from the relevant attributes. (TestResolveContentsConflict, TestResolvePathConflict, TestResolveDuplicateEntry, TestResolveParentLoop): Implement the specific conflict attributes handling. And simplify the helpers accordingly. (TestResolvePathConflictBefore531967.assertPathConflict): Grrr, redo the fix lost in the merge from trunk.	Vincent Ladeuil	14 years ago
4597.10.7		Simplify scenarios mirroring and give a better docstring for... Simplify scenarios mirroring and give a better docstring for TestParametrizedResolveConflicts. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.mirror_scenarios): Better doc string. Stop flattening the dicts, embed them in the scenario instead.	Vincent Ladeuil	14 years ago
4597.10.6		Merge cleanup into more-tests Merge cleanup into more-tests	Vincent Ladeuil	14 years ago
4597.10.5		Merge 537956-parent-loop-incomplete into more-tests Merge 537956-parent-loop-incomplete into more-tests	Vincent Ladeuil	14 years ago
4597.10.4		Handle TestResolveParentLoop expected failures more precisel... Handle TestResolveParentLoop expected failures more precisely.	Vincent Ladeuil	14 years ago
4597.10.3		Remove ParentLoop blacbox tests. Remove ParentLoop blacbox tests.	Vincent Ladeuil	14 years ago
4597.10.2		Merge 537956-parent-loop-incomplete into more-tests Merge 537956-parent-loop-incomplete into more-tests	Vincent Ladeuil	14 years ago
4597.10.1		Refactor to better handle various conflict types. Refactor to better handle various conflict types. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts): Use _this_args and _other_args since different conflicts have different needs. Also get rid of _item_id and _item_path. Finally move all helpers to the relevant test conflict classes. All daughter classes now define their own semantic for the arguments associated with actions and implement the necessary hooks/specializations where relevant.	Vincent Ladeuil	14 years ago
4597.8.10		Add a NEWS entry. Add a NEWS entry.	Vincent Ladeuil	14 years ago
4597.8.9		Mark the expected failing tests as such. Mark the expected failing tests as such. * bzrlib/tests/test_conflicts.py: (TestResolveParentLoop.assertParentLoop): Crude way to raise the KnownFailure.	Vincent Ladeuil	14 years ago
4597.8.8		Exhibit bug #537956. Exhibit bug #537956. * bzrlib/conflicts.py: (ParentLoop.format): Fix parameter order to correctly reflect the attempted action leading to the conflict. * bzrlib/tests/test_conflicts.py: (TestResolveParentLoop.scenarios): Add one scenario with known failures.	Vincent Ladeuil	14 years ago
4597.8.7		Add whitebox tests for ParentLoop. Add whitebox tests for ParentLoop. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.check_resolved): Allow the path passed to resolve to be specialized. (TestResolveParentLoop): Replace blackbox tests.	Vincent Ladeuil	14 years ago
4597.8.6		More precise test. More precise test. * bzrlib/tests/test_conflicts.py: (TestResolveDuplicateEntry.assertDuplicateEntry): Also check conflict_path.	Vincent Ladeuil	14 years ago
4597.8.5		Replace DuplicateEntry blackbox tests by whitebox ones. Replace DuplicateEntry blackbox tests by whitebox ones. * bzrlib/tests/test_conflicts.py: (TestResolveDuplicateEntry): Replace blackbox tests.	Vincent Ladeuil	14 years ago

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1