Merge lp://qastaging/~ubuntu-branches/ubuntu/oneiric/gnutls26/oneiric-201105202113 into lp://qastaging/ubuntu/oneiric/gnutls26
Proposed by
James Westby
| Status: | Rejected |
|---|---|
| Rejected by: | Martin Pitt |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/oneiric/gnutls26/oneiric-201105202113 |
| Merge into: | lp://qastaging/ubuntu/oneiric/gnutls26 |
| Diff against target: |
1324 lines (+1301/-0) (has conflicts) 2 files modified
.pc/debian-changes-2.8.6-1ubuntu1/doc/examples/Makefile.am (+78/-0) .pc/debian-changes-2.8.6-1ubuntu1/doc/examples/Makefile.in (+1223/-0) Text conflict in .pc/debian-changes-2.8.6-1ubuntu1/doc/examples/Makefile.am Text conflict in .pc/debian-changes-2.8.6-1ubuntu1/doc/examples/Makefile.in |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/oneiric/gnutls26/oneiric-201105202113 |
| 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/oneiric/gnutls26 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gnutls26/oneiric-201105202113. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 27. By Steve Langasek
-
releasing version 2.10.5-1ubuntu1
- 26. By Steve Langasek
-
merge from unstable
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
