~bzr-pqm/bzr/bzr.dev

From Revision 4597.14.11 to 4597.9.13

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
4597.14.11		Fix the news entry. Fix the news entry.	Vincent Ladeuil	14 years ago
4597.14.10		Merge cleanup into 638451-malformed Merge cleanup into 638451-malformed	Vincent Ladeuil	14 years ago
4597.14.9		Fix typo. Fix typo.	Vincent Ladeuil	14 years ago
4597.14.8		Describe --take-this and --take-other actions for text confl... Describe --take-this and --take-other actions for text conflicts.	Vincent Ladeuil	14 years ago
4597.14.7		Merge cleanup into 638451-malformed Merge cleanup into 638451-malformed	Vincent Ladeuil	14 years ago
4597.14.6		Merge cleanup into 638451-malformed Merge cleanup into 638451-malformed	Vincent Ladeuil	14 years ago
4597.14.5		Merge reports-conflict-resolved into 638451-malformed Merge reports-conflict-resolved into 638451-malformed	Vincent Ladeuil	14 years ago
4597.14.4		Merge reports-conflict-resolved into 638451-malformed Merge reports-conflict-resolved into 638451-malformed	Vincent Ladeuil	14 years ago
4597.14.3		Remove the now (wrongly) failing blacbox test. Remove the now (wrongly) failing blacbox test.	Vincent Ladeuil	14 years ago
4597.14.2		Implements --take-this and --take-other when resolving text ... Implements --take-this and --take-other when resolving text conflicts	Vincent Ladeuil	14 years ago
4597.14.1		Merge reports-conflict-resolved into 638451-malformed Merge reports-conflict-resolved into 638451-malformed	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

• Older »

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