Merge lp:~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick-201006161146 into lp:ubuntu/maverick/ubuntuone-client
Proposed by
James Westby
Status: | Rejected |
---|---|
Rejected by: | dobey |
Proposed branch: | lp:~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick-201006161146 |
Merge into: | lp:ubuntu/maverick/ubuntuone-client |
Diff against target: |
18 lines (+4/-0) (has conflicts) 1 file modified
debian/changelog (+4/-0) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick-201006161146 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
dobey | Disapprove | ||
Review via email: mp+27699@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/maverick/ubuntuone-client now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/ubuntuone-client/maverick-201006161146. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 31. By Ken VanDine
-
releasing version 1.2.1-0ubuntu2
The only thing in this diff is conflict marking text, and a duplicated line.