Merge lp:~ubuntu-branches/ubuntu/oneiric/puppet/oneiric-201105031912 into lp:ubuntu/oneiric/puppet
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | 51 |
| Proposed branch: | lp:~ubuntu-branches/ubuntu/oneiric/puppet/oneiric-201105031912 |
| Merge into: | lp:ubuntu/oneiric/puppet |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/oneiric/puppet/oneiric-201105031912 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson | Approve | ||
|
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/puppet now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/puppet/oneiric-201105031912. A merge should be performed if necessary.
To post a comment you must log in.
The tag was in the wrong place on the old branch, hence the auto-import. There's a small amount of extra credit (author/committer names) in the old branch, so I'll merge the history even though it causes no file changes.