Merge lp:~ubuntu-branches/ubuntu/precise/esound/precise-201110201247 into lp:ubuntu/precise/esound

Proposed by Ubuntu Package Importer
Status: Rejected
Rejected by: James Westby
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/esound/precise-201110201247
Merge into: lp:ubuntu/precise/esound
Diff against target: 19 lines (+6/-0) (has conflicts)
1 file modified
debian/control (+6/-0)
Text conflict in debian/control
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/esound/precise-201110201247
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email:

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/esound reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/esound/precise-201110201247. 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.

Unmerged revisions

32. By Steve Langasek

releasing version 0.2.41-9ubuntu1

31. By Steve Langasek

run update-maintainer

30. By Steve Langasek

Build for multiarch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2011-10-19 22:24:15 +0000
3+++ debian/control 2011-10-20 12:53:24 +0000
4@@ -6,9 +6,15 @@
5 Source: esound
6 Section: sound
7 Priority: optional
8+<<<<<<< TREE
9 Maintainer: Ubuntu Developers <>
10 XSBC-Original-Maintainer: Josselin Mouette <>
11 Uploaders: Debian GNOME Maintainers <>, Emilio Pozuelo Monfort <>, Josselin Mouette <>, Loic Minier <>
13+Maintainer: Ubuntu Developers <>
14+XSBC-Original-Maintainer: Josselin Mouette <>
15+Uploaders: Debian GNOME Maintainers <>, Emilio Pozuelo Monfort <>, Loic Minier <>
16+>>>>>>> MERGE-SOURCE
17 Standards-Version: 3.9.0
18 Build-Depends: libaudiofile-dev (>= 0.2.3),
19 libasound2-dev [linux-any],


People subscribed via source and target branches

to all changes: