lp:~doxxx/bzr/bug939605

Branch merges

Rejected for merging into lp:bzr

Martin Pool: Approve on 2012-02-27

Martin Packman (community): Needs Information on 2012-02-27

Alexander Belchenko: Approve on 2012-02-24

Diff: 155 lines (+53/-21)

5 files modified

bzrlib/mergetools.py (+16/-7)
bzrlib/osutils.py (+12/-9)
bzrlib/tests/test_mergetools.py (+14/-5)
bzrlib/tests/test_osutils.py (+8/-0)
doc/en/release-notes/bzr-2.6.txt (+3/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #939605: qconflicts says that my merge tool is not available. what should I do?

Medium

Fix Released

Link a bug report

Related blueprints

6481. By Gordon Tyler on 2012-02-27

Re-removed unnecessary import.

6480. By Gordon Tyler on 2012-02-27

Improved readablity of check_availability.

6479. By Gordon Tyler on 2012-02-27

Removed unnecessary import.

6478. By Gordon Tyler on 2012-02-27

Updated mergetools._get_executable_path and improved test_invoke_expands_exe_path.

6477. By Gordon Tyler on 2012-02-27

Changed osutils.find_executable_on_path to search using win32utils.get_app_path if the executable is not found using the PATH env var.

6476. By Gordon Tyler on 2012-02-24

Updated release notes.

6475. By Gordon Tyler on 2012-02-24

Added _get_executable_path function to mergetools module, which searches the PATH and App Path registry on win32.
Changed check_availability and invoke to use _get_executable_path.
Updated tests.

6474. By Patch Queue Manager <email address hidden> on 2012-02-23

(jelmer) Use Tree.iter_children() in a couple more places. (Jelmer Vernooij)

6473. By Patch Queue Manager <email address hidden> on 2012-02-23

(jelmer) Merge bzr/2.5. (Jelmer Vernooij)

6472. By Patch Queue Manager <email address hidden> on 2012-02-22

(jelmer) Use inventories directly in fewer places. (Jelmer Vernooij)