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

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

From Revision 4312.1.1 to 4294

Rev	Summary	Authors	Date
4312.1.1	Add a per-implementation test that deleting lines conflicts ... Add a per-implementation test that deleting lines conflicts with modifying lines. At the moment, I don't see a simple way to implement this for LCA merge, so I'm just marking it as 'expectedFailure'. However, it works for both Weave merge and for Merge3. Fixes bug #328171	John Arbash Meinel	15 years ago
4312	(tanner) merge 1.14 to trunk (tanner) merge 1.14 to trunk	Canonical.com Patch ...	15 years ago
4311	(vila) Respect ~/.ssh/config usernames for bzr+ssh connectio... (vila) Respect ~/.ssh/config usernames for bzr+ssh connections (#367726)	Canonical.com Patch ...	15 years ago
4310	(tanner) merge 1.13.2 to trunk (tanner) merge 1.13.2 to trunk	Canonical.com Patch ...	15 years ago
4309	(Marius Kruger) Don't raise KnownFailure for all coding styl... (Marius Kruger) Don't raise KnownFailure for all coding style regressions.	Canonical.com Patch ...	15 years ago
4308	(nmb) Change rules documentation to better describe users of... (nmb) Change rules documentation to better describe users of rules.	Canonical.com Patch ...	15 years ago
4307	(andrew) Check for missing parent inventories in StreamSink. (andrew) Check for missing parent inventories in StreamSink.	Canonical.com Patch ...	15 years ago
4306	(gbache) Handle symlinks better in bzr add (gbache) Handle symlinks better in bzr add	Canonical.com Patch ...	15 years ago
4305	(vila) Make built-in plugins display the same version than b... (vila) Make built-in plugins display the same version than bzrlib	Canonical.com Patch ...	15 years ago
4304	(robertc) Reduce roundtrips needed to push a new branch by c... (robertc) Reduce roundtrips needed to push a new branch by coalescing many steps of the initialisation process. (Robert Collins)	Canonical.com Patch ...	15 years ago
4303	(mbp) fix problem with prompting in break-lock (mbp) fix problem with prompting in break-lock	Canonical.com Patch ...	15 years ago
4302	(abentley) store tree-references in a new branch format. (abentley) store tree-references in a new branch format.	Canonical.com Patch ...	15 years ago
4301	(jam) Tweaks to the pure-python group compressor, (jam) Tweaks to the pure-python group compressor, shrinks time from 30min => 4min for some circumstances.	Canonical.com Patch ...	15 years ago
4300	(tanner) merge release 1.14rc2 back into bzr.dev (tanner) merge release 1.14rc2 back into bzr.dev	Canonical.com Patch ...	15 years ago
4299	(Jelmer) Don't retrieve the tree if log is called on the roo... (Jelmer) Don't retrieve the tree if log is called on the root.	Canonical.com Patch ...	15 years ago
4298	(vila) (trivial) More cleanup test imports and use features ... (vila) (trivial) More cleanup test imports and use features to better track skipped tests	Canonical.com Patch ...	15 years ago
4297	log --include-merges (Ian Clatworthy) log --include-merges (Ian Clatworthy)	Canonical.com Patch ...	15 years ago
4296	(Neil Martinsen-Burrell) Fix 'bzr send' using MAPI. (Neil Martinsen-Burrell) Fix 'bzr send' using MAPI.	Canonical.com Patch ...	15 years ago
4295	(jam) Remove _LRUNode from the linked list as well as the di... (jam) Remove _LRUNode from the linked list as well as the dict.	Canonical.com Patch ...	15 years ago
4294	(Jelmer) Use -- before recipient address in mutt command-lin... (Jelmer) Use -- before recipient address in mutt command-line.	Canonical.com Patch ...	15 years ago

Older »