Merge lp://staging/~ubuntu-branches/ubuntu/natty/wicd/natty-201101220052 into lp://staging/ubuntu/natty/wicd
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/wicd/natty-201101220052 |
| Merge into: | lp://staging/ubuntu/natty/wicd |
| Diff against target: |
314 lines (+300/-0) (has conflicts) 2 files modified
.pc/31-deepcopy+python27-fixes.patch/wicd/configmanager.py (+212/-0) debian/patches/31-deepcopy+python27-fixes.patch (+88/-0) Conflict adding file .pc/31-deepcopy+python27-fixes.patch. Moved existing file to .pc/31-deepcopy+python27-fixes.patch.moved. Conflict adding file debian/patches/31-deepcopy+python27-fixes.patch. Moved existing file to debian/patches/31-deepcopy+python27-fixes.patch.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/wicd/natty-201101220052 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/wicd now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/wicd/natty-201101220052. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 18. By Stefano Rivera
-
* debian/patches/
- Added 31-deepcopy+python27- fixes.patch for python 2.7
(credit to Archlinux and Remy Oudompheng - LP: #602825)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
