Merge lp:~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150 into lp:ubuntu/trusty/llvm-toolchain-snapshot
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150 |
| Merge into: | lp:ubuntu/trusty/llvm-toolchain-snapshot |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150 |
| 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/trusty/llvm-toolchain-snapshot reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150. 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
- 8. By Matthias Klose
-
* Really disable all tests to get a package into the archive (hanging
on the buildds at least on armhf and powerpc).
* Disable the lldb packages for AArch64 in the control file too.
* Really apply the lldb-link-atomic. diff patch. - 7. By Matthias Klose
-
Disable the lldb build for AArch64.
- 6. By Sylvestre Ledru
-
* New snapshot release
* Merge changes from the 3.3 branch (see 1:3.3-9)
* Remove ia64-fix.diff (applied upstream)
* cpp11-migrate renamed to clang-modernize
* lldb-3.4 is back to Architectures: any
* Patch lldb-hurd.diff removed (applied upstream)
* Directory www/ from tarballs polly & lldb removed
* Update of the description of LLVM packages[ Luca Falavigna ]
* debian/control:
- Add llvm-3.4-dev to lldb-3.4 Depends field.
