Merge lp://staging/~ubuntu-branches/ubuntu/precise/plymouth/precise-201311300306 into lp://staging/ubuntu/precise/plymouth
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/precise/plymouth/precise-201311300306 |
| Merge into: | lp://staging/ubuntu/precise/plymouth |
| Diff against target: |
8207 lines (+8060/-28) (has conflicts) 11 files modified
.pc.moved/tty1-after-boot.patch/src/main.c (+1/-7) .pc/applied-patches (+23/-0) .pc/debug-fixes.patch/src/main.c (+1992/-0) .pc/initramfsless-boot.patch/src/main.c (+2003/-0) .pc/main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch/src/main.c (+1986/-0) .pc/upstream-terminal-no-ISTRIP.patch/src/main.c (+1986/-0) debian/changelog (+13/-0) debian/patches/initramfsless-boot.patch (+54/-0) debian/patches/misc-changes.patch (+0/-14) debian/patches/series (+1/-0) src/main.c (+1/-7) Conflict adding files to .pc. Created directory. Conflict because .pc is not versioned, but has versioned children. Versioned directory. Conflict adding file .pc. Moved existing file to .pc.moved. Conflict adding files to .pc/debug-fixes.patch. Created directory. Conflict because .pc/debug-fixes.patch is not versioned, but has versioned children. Versioned directory. Conflict adding files to .pc/debug-fixes.patch/src. Created directory. Conflict because .pc/debug-fixes.patch/src is not versioned, but has versioned children. Versioned directory. Conflict adding files to .pc/main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch. Created directory. Conflict because .pc/main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch is not versioned, but has versioned children. Versioned directory. Conflict adding files to .pc/main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch/src. Created directory. Conflict because .pc/main-Don-t-watch-for-keyboard-input-if-no-keyboard.patch/src is not versioned, but has versioned children. Versioned directory. Conflict adding files to .pc/upstream-terminal-no-ISTRIP.patch. Created directory. Conflict because .pc/upstream-terminal-no-ISTRIP.patch is not versioned, but has versioned children. Versioned directory. Conflict adding files to .pc/upstream-terminal-no-ISTRIP.patch/src. Created directory. Conflict because .pc/upstream-terminal-no-ISTRIP.patch/src is not versioned, but has versioned children. Versioned directory. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/precise/plymouth/precise-201311300306 |
| Related bugs: |
| 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/plymouth reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/plymouth/precise-201311300306. 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:/
(this is an automatically generated message)
Unmerged revisions
- 1425. By Steve Langasek
-
* debian/
patches/ initramfsless- boot.patch: clean up our failure path when
/dev/pts isn't available yet:
- don't free a buffer that we might use again later
- once we've created the session object, keep it around, instead of
freeing it again and leaving a dangling reference to it in the loop
exit handler list.
it's not clear if this was working before, but it definitely hits an
assert now. LP: #981314. - 1424. By Steve Langasek
-
split initramfsless boot support out into a separate patch
- 1423. By Colin Watson
-
releasing version 0.8.2-2ubuntu30
- 1422. By Colin Watson
-
merge lp:~jamesodhunt/ubuntu/precise/plymouth/bug-553745, with added quilt fixing
- 1421. By Colin Watson
-
add lots of .pc files to try to stop the importer thinking it needs to overwrite this branch
- 1420. By Steve Langasek
-
merge fix for bug #979824
- 1419. By Steve Langasek
-
releasing version 0.8.2-2ubuntu29
- 1418. By Steve Langasek
-
debian/
plymouth- theme-{ k,}ubuntu- text.{triggers, postinst} : regenerate
our theme when /etc/lsb-release changes. LP: #957380. - 1417. By Steve Langasek
-
debian/
patches/ tty1-after- boot.patch: Switch back to tty1 on exit if
started with vt.handoff. Closes LP: #913731. - 1416. By Steve Langasek
-
the new file is named ubuntu_logo.png, not ubuntu-logo.png.
