Merge lp:~ubuntu-branches/ubuntu/precise/ureadahead/precise-201202040105 into lp:ubuntu/precise/ureadahead

Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/ureadahead/precise-201202040105
Merge into: lp:ubuntu/precise/ureadahead
Diff against target: 41 lines (+13/-4) (has conflicts)
2 files modified
debian/changelog (+12/-0)
debian/ureadahead.postinst (+1/-4)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/ureadahead/precise-201202040105
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+91527@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/precise/ureadahead reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/ureadahead/precise-201202040105. 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

26. By Steve Langasek

releasing version 0.100.0-12

25. By Steve Langasek

debian/ureadahead.postinst: remove /var/lib/ureadahead also on upgrade of
ureadahead itself, not just when triggered by the upgrade of /another/
package shipping an upstart job.

24. By Steve Langasek

src/trace.c: add /run to the set of paths to ignore.

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 2012-02-03 15:27:29 +0000
3+++ debian/changelog 2012-02-04 01:11:19 +0000
4@@ -1,9 +1,21 @@
5+<<<<<<< TREE
6 ureadahead (0.100.0-12) precise; urgency=low
7
8 * src/trace.c: add /run to the set of paths to ignore.
9
10 -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 03 Feb 2012 15:27:29 -0800
11
12+=======
13+ureadahead (0.100.0-12) precise; urgency=low
14+
15+ * src/trace.c: add /run to the set of paths to ignore.
16+ * debian/ureadahead.postinst: remove /var/lib/ureadahead also on upgrade of
17+ ureadahead itself, not just when triggered by the upgrade of /another/
18+ package shipping an upstart job.
19+
20+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 03 Feb 2012 15:51:27 -0800
21+
22+>>>>>>> MERGE-SOURCE
23 ureadahead (0.100.0-11) natty; urgency=low
24
25 * src/trace.c: leave room for string termination on reads (LP: #485194).
26
27=== modified file 'debian/ureadahead.postinst'
28--- debian/ureadahead.postinst 2009-11-09 18:38:51 +0000
29+++ debian/ureadahead.postinst 2012-02-04 01:11:19 +0000
30@@ -20,10 +20,7 @@
31
32
33 case "$1" in
34- configure)
35- ;;
36-
37- triggered)
38+ configure|triggered)
39 # Force a reprofile
40 if [ -f /var/lib/ureadahead/pack ]; then
41 echo "ureadahead will be reprofiled on next reboot"

Subscribers

People subscribed via source and target branches

to all changes: