~bzr-pqm/bzr/bzr.dev

From Revision 4597.3.73 to 4597.3.54

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
4597.3.73		All Conflict action method names start with 'action_' to avo... All Conflict action method names start with 'action_' to avoid potential namespace collisions	Vincent Ladeuil	14 years ago
4597.3.72		Tweak once more. Tweak once more.	Vincent Ladeuil	14 years ago
4597.3.71		As per review comments, put back the light rest markup allow... As per review comments, put back the light rest markup allowed.	Vincent Ladeuil	14 years ago
4597.3.70		Fix NEWS. Fix NEWS.	Vincent Ladeuil	14 years ago
4597.3.69		Merge description into dont-add-conflict-helpers Merge description into dont-add-conflict-helpers	Vincent Ladeuil	14 years ago
4597.3.68		Don't use rest syntax for text displayed as-is to users. Don't use rest syntax for text displayed as-is to users. * bzrlib/help_topics/en/conflict-types.txt:  Despite apparences, this is displayed as is to the user and should *not* use any fancy rest syntax (and that means no comments either).	Vincent Ladeuil	14 years ago
4597.3.67		Settle with --take-this and --take-other as action names. Settle with --take-this and --take-other as action names.	Vincent Ladeuil	14 years ago
4597.3.66		Merge description into dont-add-conflict-helpers Merge description into dont-add-conflict-helpers	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

• Older »

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