Merge lp:~doxxx/bzr/bug939605-2.5 into lp:bzr/2.5
Proposed by
Gordon Tyler
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6485 |
Proposed branch: | lp:~doxxx/bzr/bug939605-2.5 |
Merge into: | lp:bzr/2.5 |
Diff against target: |
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.5.txt (+3/-0) |
To merge this branch: | bzr merge lp:~doxxx/bzr/bug939605-2.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Approve | ||
Review via email: mp+94909@code.launchpad.net |
Commit message
Locate applications using the windows registry in addition to the PATH envvar
Description of the change
Backport of fix for bug 939605 to bzr 2.5 series.
To post a comment you must log in.
Changes look good.
+ # Internt Explorer is always registered in the App Path (osutils. find_executable _on_path( 'iexplore' ) is not None)
+ self.assertTrue
I wonder a little if one of those people who purge IE from their system will ever run our test suite. Not worrying about that seems correct, the test looks fine (though 'is not None' is perhaps not useful).
See earlier mp for initial reviews:
<https:/ /code.launchpad .net/~doxxx/ bzr/bug939605/ +merge/ 94488>