Merge lp:~ubuntu-branches/ubuntu/lucid/watershed/lucid-201003070318 into lp:ubuntu/lucid/watershed
Proposed by
James Westby
Status: | Needs review |
---|---|
Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/watershed/lucid-201003070318 |
Merge into: | lp:ubuntu/lucid/watershed |
Diff against target: |
11 lines (+0/-1) 1 file modified
debian/control (+0/-1) |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/watershed/lucid-201003070318 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott James Remnant (Canonical) | Pending | ||
Review via email: mp+20848@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/lucid/watershed now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/watershed/lucid-201003070318. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 12. By Scott James Remnant (Canonical)
-
Delete vcs-bzr since this is now in the right place
Hi Scott,
Your Vcs-Bzr change wasn't included in the recent upload of
watershed as it was done ignoring Bazaar. Would you merge it
in again if appropriate?
Thanks,
James