Merge lp:~ubuntu-branches/ubuntu/oneiric/gtksourceview3/oneiric-201104302327 into lp:ubuntu/oneiric/gtksourceview3
Proposed by
James Westby
Status: | Merged |
---|---|
Merge reported by: | Benjamin Drung |
Merged at revision: | not available |
Proposed branch: | lp:~ubuntu-branches/ubuntu/oneiric/gtksourceview3/oneiric-201104302327 |
Merge into: | lp:ubuntu/oneiric/gtksourceview3 |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/oneiric/gtksourceview3/oneiric-201104302327 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benjamin Drung | Disapprove | ||
Ubuntu branches | Pending | ||
Review via email: mp+59602@code.launchpad.net |
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/gtksourceview3 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gtksourceview3/oneiric-201104302327. A merge should be performed if necessary.
To post a comment you must log in.
This merge contains to diff. I will set the status to merged instead of Rejected, because I can't set it to Rejected.