Merge lp:~ubuntu-branches/ubuntu/oneiric/yaboot/oneiric-201109040608 into lp:ubuntu/oneiric/yaboot

[Ubuntu Package Importer]

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

[Colin Watson (cjwatson)]

'bzr merge' has a different opinion about the conflicts (none, and in fact no content changes caused by the merge), and there's no significant extra history here either, so rejecting.

review: Disapprove

Unmerged revisions

25. By Luke Yelavich on 2011-08-19

releasing version 1.3.16-3ubuntu1

24. By Luke Yelavich on 2011-08-19

Merge with debian

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-08-19 12:58:37 +0000
+++ .pc/applied-patches	2011-09-04 06:12:24 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 261488_german_manpage.patch
 375680_xfs_support.patch
 new_fsf_address.patch
@@ -9,3 +10,14 @@
 e2fs-missing-libc.patch
 ubuntu-branding.patch
 cell-support.patch
+=======
+261488_german_manpage.patch
+375680_xfs_support.patch
+new_fsf_address.patch
+build-system.patch
+debian-branding.patch
+no-proc-scsi.patch
+no-unix-block-names.patch
+e2fs-posix-memalign.patch
+e2fs-missing-libc.patch
+>>>>>>> MERGE-SOURCE

=== modified file 'first/ofboot'
--- first/ofboot	2011-08-19 12:58:37 +0000
+++ first/ofboot	2011-09-04 06:12:24 +0000
@@ -336,7 +336,11 @@
 $BGCOLOR to background-color
 \" \"(0C)\" .printf
 
+<<<<<<< TREE
 \" First Stage Ubuntu Bootstrap\"(0d 0a)\" .printf
+=======
+\" First Stage Debian GNU/Linux Bootstrap\"(0d 0a)\" .printf
+>>>>>>> MERGE-SOURCE
 \"  \"(0d 0a)\" .printf
 $MENUOPTS
 \"  \"(0d 0a)\" .printf

=== modified file 'ybin/ofpath'
=== modified file 'ybin/ybin'