lp:~doxxx/bzr/bug939605
Created by
Gordon Tyler
on
2012-02-24
and last modified on
2012-02-27
- Get this branch:
- bzr branch lp:~doxxx/bzr/bug939605
Only
Gordon Tyler
can upload to this branch. If you are
Gordon Tyler
please log in for upload directions.
Branch merges
Propose for merging
- 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 modifiedbzrlib/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)
Related bugs
Related blueprints
Branch information
Recent revisions
- 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. - 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)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr