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

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

Rev	Summary	Authors	Date
4597.6.4	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.6.3	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.6.2	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.6.1	Fix typo Fix typo	Vincent Ladeuil	14 years ago
4597.3.65	The bugs aren't fixed until the options are taken into accou... The bugs aren't fixed until the options are taken into account for text conflicts too (which requires at least discussion and the ability to resolve only the conflicted regions as opposed to taking .THIS or .OTHER as whole).	Vincent Ladeuil	14 years ago
4597.3.64	Fixed as per Aaron's remark. Fixed as per Aaron's remark. * bzrlib/tests/test_conflicts.py: (TestResolveParentLoop.test_resolve_keeping_mine, TestResolveParentLoop.test_resolve_taking_theirs): Toghten the tests as debug showed they were passing with bogus code. * bzrlib/conflicts.py: (ParentLoop.take_theirs): Use a TreeTransform to safely rename multiple files at once.	Vincent Ladeuil	14 years ago
4597.3.63	That's take-theirs not take-their. That's take-theirs not take-their.	Vincent Ladeuil	14 years ago
4597.3.62	Fix grammar as per Aaron's review. Fix grammar as per Aaron's review.	Vincent Ladeuil	14 years ago
4597.3.61	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.60	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.59	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.58	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.57	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.56	Add a NEWS entry and prepare submission. Add a NEWS entry and prepare submission.	Vincent Ladeuil	14 years ago
4597.3.55	More cleanup. More cleanup.	Vincent Ladeuil	14 years ago
4597.3.54	There is no point to define Conflict.done() multiple times. There is no point to define Conflict.done() multiple times.	Vincent Ladeuil	14 years ago
4597.3.53	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	14 years ago
4597.3.52	Replace --interactive by --action. Replace --interactive by --action. * bzrlib/tests/test_conflicts.py: Switch from --interactive to --action. * bzrlib/tests/blackbox/test_conflicts.py: (TestResolve): Delete the --interactive tests. * bzrlib/conflicts.py: (cmd_resolve.run): Add an 'action' parameter. Refactor to clarify what action is executed when. Get rid of the --interactive attempt. (resolve): Add an 'action' parameter. Refactor to make the conflict deletion depends on the resolution success. (_resolve_interactive): Deleted. (ConflictList.remove_files): Use conflict.cleanup() (Conflict._do): Helper to execute an arbitratry resolution action. (Conflict.cleanup, Conflict.done, Conflict.keep_mine, Conflict.take_their): Declare the abstract methods. (PathConflict.cleanup, PathConflict.done): Do-nothing implementations. (ContentsConflict.cleanup): Specific cleanup (strange). (TextConflict.cleanup): Specific cleanup. (HandledConflict.done, HandledConflict.cleanup): Do nothing implementations. (UnversionedParent.keep_mine, UnversionedParent.take_their): Hmm, forced do-nothing implementations, something weird is going on here.	Vincent Ladeuil	14 years ago
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

Older »