Merge lp:~ubuntu-branches/ubuntu/oneiric/pidgin-libnotify/oneiric-201108110836 into lp:ubuntu/oneiric/pidgin-libnotify

Proposed by Ubuntu Package Importer on 2011-09-02
Status: Rejected
Rejected by: Martin Pitt on 2011-09-08
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/pidgin-libnotify/oneiric-201108110836
Merge into: lp:ubuntu/oneiric/pidgin-libnotify
Diff against target: 0 lines
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/pidgin-libnotify/oneiric-201108110836
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-09-02 Pending
Review via email:

Description of the change

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/pidgin-libnotify reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/pidgin-libnotify/oneiric-201108110836. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.
Didier Roche (didrocks) wrote :

empty diff? the final branch as the current revision though.

Unmerged revisions

27. By Ken VanDine on 2011-08-11

releasing version 0.14-4ubuntu8

Preview Diff



People subscribed via source and target branches

to all changes: