Merge lp://staging/~ubuntu-branches/ubuntu/precise/checkbox/precise-201204040741 into lp://staging/ubuntu/precise/checkbox
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/precise/checkbox/precise-201204040741 |
| Merge into: | lp://staging/ubuntu/precise/checkbox |
| Diff against target: |
282 lines (+258/-0) (has conflicts) 4 files modified
debian/po/ast.po (+120/-0) po/Makevars (+42/-0) qt/frontend/checkboxtr.cpp (+49/-0) qt/frontend/checkboxtr.h (+47/-0) Conflict adding file debian/po/ast.po. Moved existing file to debian/po/ast.po.moved. Conflict adding file po/Makevars. Moved existing file to po/Makevars.moved. Conflict adding file qt/frontend/checkboxtr.cpp. Moved existing file to qt/frontend/checkboxtr.cpp.moved. Conflict adding file qt/frontend/checkboxtr.h. Moved existing file to qt/frontend/checkboxtr.h.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/precise/checkbox/precise-201204040741 |
| 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/checkbox reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/checkbox/precise-201204040741. 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
- 42. By Daniel Holbach
-
* New upstream release (LP: #971889)
* Automated translation file updates from Launchpad
* Fixed string_to_type conversion in network_bandwidth_ test (LP: #954587)
* Internationalization support in checkbox-qt; updated checkbox.pot file
(LP: #951054)
* plugins/jobs_info. py: Checkbox doesn't warn that invalid whitelist patterns
are being used (LP: #937651)
