lp:~baztian/bzr/recursive-diff

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:bzr/2.5

Vincent Ladeuil: Needs Resubmitting on 2012-03-16

Diff: 402 lines (+278/-10)

5 files modified

bzrlib/builtins.py (+6/-0)
bzrlib/diff.py (+44/-9)
bzrlib/tests/blackbox/test_diff.py (+122/-0)
bzrlib/tests/test_diff.py (+102/-0)
doc/en/release-notes/bzr-2.5.txt (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6261. By Bastian on 2012-03-13

Show diffs using a custom diff program that supports directory based diff

6260. By Patch Queue Manager <email address hidden> on 2011-11-14

(jelmer) Fix typo in Bazaar with Launchpad tutorial. (Jelmer Vernooij)

6259. By Patch Queue Manager <email address hidden> on 2011-11-14

(jelmer) Handle repository formats that don't support revision signatures in
 the testsuite. (Jelmer Vernooij)

6258. By Patch Queue Manager <email address hidden> on 2011-11-14

(mbp) Back-out BadIndexKey assertion in r6256 (Martin Pool)

6257. By Patch Queue Manager <email address hidden> on 2011-11-11

(gz) Merge 2.4 into dev (Martin Packman)

6256. By Patch Queue Manager <email address hidden> on 2011-11-11

(mbp) raise BadIndexKey rather than crashing if the key is unreasonably long
 (Shannon Weyrick)

6255. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) More tweaks to the release workflow. (Vincent Ladeuil)

6254. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) Open 2.5b4 for bug fixes (Vincent Ladeuil)

6253. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) Release 2.5b3 (Vincent Ladeuil)

6252. By Patch Queue Manager <email address hidden> on 2011-11-10

(vila) Implement 'relpath' as a section local option. (Vincent Ladeuil)