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
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.
Revision history for this message
James Westby (james-w) wrote :

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

Unmerged revisions

12. By Scott James Remnant (Canonical)

Delete vcs-bzr since this is now in the right place

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2009-04-09 19:39:50 +0000
+++ debian/control 2010-03-07 03:23:17 +0000
@@ -4,7 +4,6 @@
4Maintainer: Scott James Remnant <scott@ubuntu.com>4Maintainer: Scott James Remnant <scott@ubuntu.com>
5Build-Depends: cdbs, debhelper (>= 7), libnettle-dev5Build-Depends: cdbs, debhelper (>= 7), libnettle-dev
6Standards-Version: 3.7.36Standards-Version: 3.7.3
7Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/watershed/ubuntu
87
9Package: watershed8Package: watershed
10Architecture: any9Architecture: any

Subscribers

People subscribed via source and target branches

to all changes: