Merge lp:~ubuntu-branches/ubuntu/saucy/clamav/saucy-201305291116 into lp:ubuntu/saucy/clamav

Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/saucy/clamav/saucy-201305291116
Merge into: lp:ubuntu/saucy/clamav
Diff against target: 22 lines (+9/-0) (has conflicts)
1 file modified
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/saucy/clamav/saucy-201305291116
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+166221@code.launchpad.net

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/saucy/clamav reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/saucy/clamav/saucy-201305291116. 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.

Unmerged revisions

126. By Martin Pitt

debian/tests: Update clamd test to not require network access.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-29 11:33:15 +0000
3+++ debian/changelog 2013-05-29 11:25:30 +0000
4@@ -1,9 +1,18 @@
5+<<<<<<< TREE
6 clamav (0.97.8+dfsg-1ubuntu3) saucy; urgency=low
7
8 * debian/tests: Update clamd test to not require network access.
9
10 -- Yolanda Robla <yolanda.robla@canonical.com> Wed, 29 May 2013 11:33:15 +0200
11
12+=======
13+clamav (0.97.8+dfsg-1ubuntu3) UNRELEASED; urgency=low
14+
15+ * debian/tests: Update clamd test to not require network access.
16+
17+ -- Yolanda Robla <yolanda.robla@canonical.com> Wed, 29 May 2013 10:41:31 +0200
18+
19+>>>>>>> MERGE-SOURCE
20 clamav (0.97.8+dfsg-1ubuntu2) saucy; urgency=low
21
22 * debian/tests: Add autopkgtest.

Subscribers

People subscribed via source and target branches

to all changes: