Merge lp://staging/~ubuntu-branches/ubuntu/quantal/checkbox/quantal-201207180641 into lp://staging/ubuntu/quantal/checkbox
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/quantal/checkbox/quantal-201207180641 |
| Merge into: | lp://staging/ubuntu/quantal/checkbox |
| Diff against target: |
1459 lines (+1046/-22) (has conflicts) 29 files modified
checkbox/parsers/efi.py (+52/-0) checkbox/parsers/tests/efi.py (+63/-0) checkbox/tests/job.py (+37/-0) checkbox/tests/message_files.py (+57/-0) data/websites/html5_video.html (+14/-0) debian/po/ast.po (+5/-1) debian/po/cs.po (+5/-1) debian/po/de.po (+5/-1) debian/po/en_AU.po (+5/-1) debian/po/en_GB.po (+5/-1) debian/po/es.po (+7/-2) debian/po/fr.po (+5/-1) debian/po/he.po (+5/-1) debian/po/hu.po (+5/-1) debian/po/it.po (+5/-1) debian/po/ja.po (+5/-1) debian/po/nl.po (+5/-1) debian/po/oc.po (+5/-1) debian/po/pl.po (+5/-1) debian/po/pt_BR.po (+5/-1) debian/po/ro.po (+5/-1) debian/po/ru.po (+5/-1) debian/po/tr.po (+5/-1) debian/po/uk.po (+5/-1) debian/po/zh_CN.po (+5/-1) debian/po/zh_TW.po (+5/-1) patches/0.14.2 (+17/-0) scripts/efi_resource (+54/-0) scripts/frequency_governors_test (+645/-0) Conflict adding file checkbox/parsers/efi.py. Moved existing file to checkbox/parsers/efi.py.moved. Conflict adding file checkbox/parsers/tests/efi.py. Moved existing file to checkbox/parsers/tests/efi.py.moved. Conflict adding file checkbox/tests/job.py. Moved existing file to checkbox/tests/job.py.moved. Conflict adding file checkbox/tests/message_files.py. Moved existing file to checkbox/tests/message_files.py.moved. Conflict adding file data/websites/html5_video.html. Moved existing file to data/websites/html5_video.html.moved. Text conflict in debian/po/ast.po Text conflict in debian/po/cs.po Text conflict in debian/po/de.po Text conflict in debian/po/en_AU.po Text conflict in debian/po/en_GB.po Text conflict in debian/po/es.po Text conflict in debian/po/fr.po Text conflict in debian/po/he.po Text conflict in debian/po/hu.po Text conflict in debian/po/it.po Text conflict in debian/po/ja.po Text conflict in debian/po/nl.po Text conflict in debian/po/oc.po Text conflict in debian/po/pl.po Text conflict in debian/po/pt_BR.po Text conflict in debian/po/ro.po Text conflict in debian/po/ru.po Text conflict in debian/po/tr.po Text conflict in debian/po/uk.po Text conflict in debian/po/zh_CN.po Text conflict in debian/po/zh_TW.po Conflict adding file patches/0.14.2. Moved existing file to patches/0.14.2.moved. Conflict adding file scripts/efi_resource. Moved existing file to scripts/efi_resource.moved. Conflict adding file scripts/frequency_governors_test. Moved existing file to scripts/frequency_governors_test.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/quantal/checkbox/quantal-201207180641 |
| 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/quantal/checkbox reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/checkbox/quantal-201207180641. 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
- 46. By Luke Yelavich
-
merge branch lp:~roadmr/ubuntu/quantal/checkbox/0.14.2
