Merge lp:~ubuntu-branches/ubuntu/oneiric/gvfs/oneiric-201109060815 into lp:ubuntu/oneiric/gvfs

Proposed by Ubuntu Package Importer on 2011-09-06
Status: Rejected
Rejected by: Colin Watson on 2011-09-07
Proposed branch: lp:~ubuntu-branches/ubuntu/oneiric/gvfs/oneiric-201109060815
Merge into: lp:ubuntu/oneiric/gvfs
Diff against target: 2 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/oneiric/gvfs/oneiric-201109060815
Reviewer Review Type Date Requested Status
Colin Watson 2011-09-06 Disapprove on 2011-09-07
Review via email: mp+74174@code.launchpad.net

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/gvfs reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gvfs/oneiric-201109060815. 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 https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.
Colin Watson (cjwatson) wrote :

The conflicts on 'bzr merge' are because the other branch was pushed with patches unapplied, which is incompatible with the importer (feel free to create branches that way, but they can't be in lp:ubuntu/* out of sync with importer behaviour). No significant extra content or history. Rejecting.

review: Disapprove

Unmerged revisions

170. By Martin Pitt on 2011-09-06

releasing version 1.9.5-0ubuntu1

169. By Martin Pitt on 2011-09-06

debian/control.in: Add libgcrypt11-dev build dependency as per
configure.ac.

168. By Martin Pitt on 2011-09-06

import new upstream release 1.9.5

167. By Martin Pitt on 2011-09-06

unapply patches

166. By Martin Pitt on 2011-09-06

debian/watch: Fix syntax.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'daemon/Makefile.am'
2=== modified file 'monitor/gdu/ggduvolumemonitor.c'

Subscribers

People subscribed via source and target branches

to all changes: