Merge lp://qastaging/~ubuntu-branches/ubuntu/oneiric/sudo/oneiric-201105230807 into lp://qastaging/ubuntu/oneiric/sudo
Proposed by
James Westby
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/oneiric/sudo/oneiric-201105230807 |
| Merge into: | lp://qastaging/ubuntu/oneiric/sudo |
| Diff against target: |
2856 lines (+2801/-0) (has conflicts) 5 files modified
.pc/CVE-2011-0010.patch/check.c (+694/-0) .pc/applied-patches (+6/-0) .pc/debian-changes-1.7.4p6-1/env.c (+996/-0) .pc/keep_home_by_default.patch/env.c (+1000/-0) debian/changelog (+105/-0) Text conflict in .pc/applied-patches Text conflict in .pc/debian-changes-1.7.4p6-1/env.c Text conflict in .pc/keep_home_by_default.patch/env.c Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/oneiric/sudo/oneiric-201105230807 |
| 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/sudo now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/sudo/oneiric-201105230807. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 50. By Michael Vogt
-
merged from lp:debian/sudo and resolved conflicts
- 49. By Michael Vogt
-
* debian/
sudo.preinst:
- if well-known ec2 vmbuilder file is found, write a file in
sudoers.d for the 'ubuntu' user (LP: #768625)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
