Merge lp:~mwilck/duplicity/0.7-series into lp:~duplicity-team/duplicity/0.7-series
Proposed by
Martin Wilck
on 2016-07-29
Status: | Merged |
---|---|
Merge reported by: | Kenneth Loafman |
Merged at revision: | not available |
Proposed branch: | lp:~mwilck/duplicity/0.7-series |
Merge into: | lp:~duplicity-team/duplicity/0.7-series |
Diff against target: |
51 lines (+26/-1) (has conflicts) 1 file modified
testing/functional/__init__.py (+26/-1) Text conflict in testing/functional/__init__.py |
To merge this branch: | bzr merge lp:~mwilck/duplicity/0.7-series |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kenneth Loafman | 2016-07-29 | Approve on 2016-07-31 | |
Review via email:
|
Description of the change
Fix the regression on Trusty.
To post a comment you must log in.
Martin Wilck (mwilck) wrote : | # |
Sorry. I'll be out of office for a week, will look into this later.
Martin Wilck (mwilck) wrote : | # |
But it's just a whitespace issue - would it be asked too much that you fix it quickly?
Kenneth Loafman (kenneth-loafman) wrote : | # |
I fixed the patch and applied it to 0.7 and 0.8 both.
review:
Approve
You have a conflict in the merge, see above. You need to start with the latest source.