lp:~ace17/bzr/fixDiff

Created by Sebastien Alaiwan and last modified
Get this branch:
bzr branch lp:~ace17/bzr/fixDiff
Only Sebastien Alaiwan can upload to this branch. If you are Sebastien Alaiwan please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Sebastien Alaiwan
Project:
Bazaar
Status:
Development

Recent revisions

6599. By Sebastien Alaiwan

Merge

6598. By Sebastien Alaiwan

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>

(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>

(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>

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

6594. By Patch Queue Manager <email address hidden>

(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>

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

6592. By Patch Queue Manager <email address hidden>

(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>

(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>

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

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.