Merge lp://qastaging/~ubuntu-branches/ubuntu/natty/screen/natty-201011051712 into lp://qastaging/ubuntu/natty/screen
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/natty/screen/natty-201011051712 |
| Merge into: | lp://qastaging/ubuntu/natty/screen |
| Diff against target: |
83 lines (+62/-0) (has conflicts) 2 files modified
debian/changelog (+11/-0) debian/patches/61-silence_command_from_echo.dpatch (+51/-0) Text conflict in debian/changelog Conflict adding file debian/patches/61-silence_command_from_echo.dpatch. Moved existing file to debian/patches/61-silence_command_from_echo.dpatch.moved. |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/natty/screen/natty-201011051712 |
| Related bugs: |
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/screen now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/screen/natty-201011051712. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 19. By Dustin Kirkland
-
releasing version 4.0.3-14ubuntu5
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
