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

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

Rev	Summary	Authors	Date
4597.9.22	Merge cleanup into reports-conflict-resolved Merge cleanup into reports-conflict-resolved	Vincent Ladeuil	14 years ago
4597.9.21	Gee, spurious merge addition deleted again in NEWS. Gee, spurious merge addition deleted again in NEWS.	Vincent Ladeuil	14 years ago
4597.9.20	Restore the modification lost in the loom pull :-/ Restore the modification lost in the loom pull :-/	Vincent Ladeuil	14 years ago
4597.9.19	resolve now reports conflicts resolved/remaining. resolve now reports conflicts resolved/remaining.	Vincent Ladeuil	14 years ago
4597.9.18	Merge cleanup into reports-conflict-resolved resolving confl... Merge cleanup into reports-conflict-resolved resolving conflicts	Vincent Ladeuil	14 years ago
4597.9.17	Merge fix for bug #646961 resolving conflicts Merge fix for bug #646961 resolving conflicts	Vincent Ladeuil	14 years ago
4597.9.16	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.15	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.14	Get rid of useless code in transform.py. Get rid of useless code in transform.py. * bzrlib/transform.py: (TreeTransformBase._parent_type_conflicts): Delete useless code. (TreeTransformBase._any_contents): Slightly simplify.	Vincent Ladeuil	14 years ago
4597.9.13	bzrlib.transform.TreeTransform.tree_kind and bzrlib.transform.TreeTransform.tree_kind and bzrlib.transform.TransformPreview.tree_kind also return None instead of raising NoSuchFile.	Vincent Ladeuil	14 years ago
4597.9.12	Merge bzr.dev into cleanup resolving conflicts Merge bzr.dev into cleanup resolving conflicts	Vincent Ladeuil	14 years ago
4597.9.11	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.10	Put NEWS entry under 2.2b3. Put NEWS entry under 2.2b3.	Vincent Ladeuil	14 years ago
4597.9.9	Fix wrong conflict resolution (thanks to test coverage...). Fix wrong conflict resolution (thanks to test coverage...).	Vincent Ladeuil	14 years ago
4597.9.8	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.7	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
4597.9.6	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.5	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.4	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago
4597.9.3	Merge bzr.dev into cleanup Merge bzr.dev into cleanup	Vincent Ladeuil	14 years ago

Older »