Merge lp://staging/~lifeless/bzr-builddeb/trunk into lp://staging/bzr-builddeb
Proposed by
Robert Collins
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 463 | ||||||||||||||||
| Proposed branch: | lp://staging/~lifeless/bzr-builddeb/trunk | ||||||||||||||||
| Merge into: | lp://staging/bzr-builddeb | ||||||||||||||||
| Diff against target: |
268 lines (+183/-27) 4 files modified
bzrtools_import.py (+32/-21) debian/changelog (+7/-0) dh_make.py (+10/-1) tests/blackbox/test_merge_upstream.py (+134/-5) |
||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~lifeless/bzr-builddeb/trunk | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bzr-builddeb-hackers | Pending | ||
|
Review via email:
|
|||
Commit message
Candidate (missing tests) fix for bug lp:588060.
Description of the change
This fixes the unversioned executability issue for me, but I haven't
written a unit test yet. Merging this as-is may be a step forward, though
a test is obviously preferrable, I'm not sure when I'll have tuits to get
around to that.
To post a comment you must log in.
Revision history for this message
| Robert Collins (lifeless) wrote | # |
Revision history for this message
| James Westby (james-w) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This now has a happy path test. \o/