lp:~ace17/bzr/fixDiff

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:bzr

Richard Wilbur: Needs Information on 2014-06-12

Diff: 31 lines (+10/-9)

1 file modified

bzrlib/diff.py (+10/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6599. By Sebastien Alaiwan on 2014-09-24

Merge

6598. By Sebastien Alaiwan on 2014-06-11

Avoid calling 'external_diff' with options passed to --diff-options if --using is specified. Fixes the following from failing 'bzr add somefile.txt ; bzr diff --using gvimdiff --diff-options '-f -n -d'

6597. By Patch Queue Manager <email address hidden> on 2014-05-08

(richard-wilbur) Jelmer: Don't pass blob to file.writelines(),
 but rather to file.write(). (Dimitri John Ledkov)

6596. By Patch Queue Manager <email address hidden> on 2014-05-07

(richard-wilbur) Also honor $XDG_CONFIG_HOME specification on Mac OS X
 platform. (Fabien Meghazi) (Fabien Meghazi (OpenERP))

6595. By Patch Queue Manager <email address hidden> on 2014-04-16

(vila) Fix command line override handling for acceptable_keys (Vincent
 Ladeuil)

6594. By Patch Queue Manager <email address hidden> on 2014-04-11

(richard-wilbur) Fix bug LP: #1123460,
 verify-signature crashes on non ascii characters (and on -v) (Reagan Sanders)

6593. By Patch Queue Manager <email address hidden> on 2014-04-09

(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

6592. By Patch Queue Manager <email address hidden> on 2014-04-03

(vila) Use LooseVersion from distutils to check Pyrex/Cython version in
 order to handle non-integers in the version string. (Andrew Starr-Bochicchio)

6591. By Patch Queue Manager <email address hidden> on 2014-02-12

(vila) The XDG Base Directory Specification uses the XDG_CACHE_HOME,
 not XDG_CACHE_DIR. (Andrew Starr-Bochicchio)

6590. By Patch Queue Manager <email address hidden> on 2014-02-10

(vila) Fix test failure on recent trusty kernels (the failure can't be
 reproduced in a trusty chroot with a saucy kernel). (Vincent Ladeuil)