Merge lp://qastaging/~ubuntu-branches/ubuntu/precise/telepathy-mission-control-5/precise-201111091815 into lp://qastaging/ubuntu/precise/telepathy-mission-control-5
Proposed by
Ubuntu Package Importer
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/precise/telepathy-mission-control-5/precise-201111091815 |
| Merge into: | lp://qastaging/ubuntu/precise/telepathy-mission-control-5 |
| Diff against target: |
63566 lines (+54294/-4132) (has conflicts) 163 files modified
debian/libmission-control-plugins0.symbols (+88/-0) doc/Makefile.am (+14/-0) doc/Makefile.in (+637/-0) doc/reference/Makefile.am (+1/-0) doc/reference/Makefile.in (+625/-0) m4/Makefile.am (+5/-0) m4/Makefile.in (+428/-0) m4/as-compiler-flag.m4 (+33/-0) m4/gtk-doc.m4 (+67/-0) m4/libtool.m4 (+8001/-0) m4/ltoptions.m4 (+384/-0) m4/ltsugar.m4 (+123/-0) m4/ltversion.m4 (+23/-0) m4/lt~obsolete.m4 (+98/-0) m4/tp-compiler-flag.m4 (+36/-0) m4/tp-compiler-warnings.m4 (+40/-0) server/Makefile.am (+42/-0) server/Makefile.in (+732/-0) server/mc-server.c (+83/-0) server/mission-control-5.8.in (+39/-0) server/org.freedesktop.Telepathy.AccountManager.service.in (+3/-0) server/org.freedesktop.Telepathy.MissionControl5.service.in (+3/-0) src/Makefile.am (+379/-0) src/Makefile.in (+1173/-0) src/channel-utils.c (+0/-154) src/channel-utils.h (+0/-48) src/client-registry.c (+748/-0) src/client-registry.h (+0/-90) src/dispatcher.xml (+7/-0) src/mcd-account-addressing.c (+0/-117) src/mcd-account-addressing.h (+0/-41) src/mcd-account-compat.c (+161/-0) src/mcd-account-conditions.c (+156/-0) src/mcd-account-conditions.h (+34/-0) src/mcd-account-config.h (+58/-0) src/mcd-account-connection.c (+169/-0) src/mcd-account-manager-default.c (+652/-0) src/mcd-account-manager-default.h (+76/-0) src/mcd-account-manager-priv.h (+65/-0) src/mcd-account-manager-query.c (+369/-0) src/mcd-account-manager-sso.c (+1756/-0) src/mcd-account-manager-sso.h (+102/-0) src/mcd-account-manager.c (+1575/-0) src/mcd-account-manager.h (+95/-0) src/mcd-account-priv.h (+191/-0) src/mcd-account-requests.c (+247/-0) src/mcd-account.c (+4444/-0) src/mcd-account.h (+147/-0) src/mcd-channel-priv.h (+84/-0) src/mcd-channel.c (+1505/-0) src/mcd-channel.h (+121/-0) src/mcd-client-priv.h (+132/-0) src/mcd-client.c (+1791/-0) src/mcd-connection-plugin.h (+58/-0) src/mcd-connection-priv.h (+81/-0) src/mcd-connection-service-points.c (+0/-179) src/mcd-connection-service-points.h (+0/-40) src/mcd-connection.c (+2867/-0) src/mcd-connection.h (+95/-0) src/mcd-controller.c (+139/-0) src/mcd-controller.h (+63/-0) src/mcd-dbusprop.c (+512/-0) src/mcd-dbusprop.h (+175/-0) src/mcd-debug.c (+218/-0) src/mcd-debug.h (+71/-0) src/mcd-dispatch-operation-priv.h (+126/-0) src/mcd-dispatch-operation.c (+2633/-0) src/mcd-dispatcher-context.h (+113/-0) src/mcd-dispatcher-priv.h (+71/-0) src/mcd-dispatcher.c (+2911/-0) src/mcd-dispatcher.h (+88/-0) src/mcd-handler-map-priv.h (+95/-0) src/mcd-handler-map.c (+474/-0) src/mcd-manager-priv.h (+0/-38) src/mcd-manager.c (+531/-0) src/mcd-manager.h (+99/-0) src/mcd-master-priv.h (+46/-0) src/mcd-master.c (+851/-0) src/mcd-master.h (+77/-0) src/mcd-misc.c (+238/-0) src/mcd-misc.h (+59/-0) src/mcd-mission-priv.h (+0/-38) src/mcd-mission.c (+339/-0) src/mcd-mission.h (+91/-0) src/mcd-operation.c (+298/-0) src/mcd-operation.h (+77/-0) src/mcd-plugin.h (+46/-0) src/mcd-provisioning-factory.c (+135/-0) src/mcd-provisioning-factory.h (+65/-0) src/mcd-provisioning.c (+122/-0) src/mcd-provisioning.h (+82/-0) src/mcd-proxy.c (+227/-0) src/mcd-proxy.h (+59/-0) src/mcd-service.c (+195/-0) src/mcd-service.h (+73/-0) src/mcd-signals-marshal.list (+19/-0) src/mcd-slacker.c (+0/-311) src/mcd-slacker.h (+0/-60) src/mcd-storage-ag-hidden.c (+0/-98) src/mcd-storage-ag-hidden.h (+0/-59) src/mcd-storage-priv.h (+0/-35) src/mcd-storage.c (+0/-430) src/mcd-storage.h (+0/-157) src/mcd-transport.c (+205/-0) src/mcd-transport.h (+85/-0) src/mcd.xml (+20/-0) src/plugin-account.c (+872/-0) src/plugin-account.h (+0/-81) src/plugin-dispatch-operation.c (+0/-408) src/plugin-dispatch-operation.h (+0/-70) src/plugin-loader.c (+0/-62) src/plugin-loader.h (+0/-34) src/plugin-request.c (+0/-285) src/plugin-request.h (+0/-61) src/request.c (+1032/-0) src/request.h (+0/-110) src/sp_timestamp.h (+110/-0) src/stamp-mcd-enum-types.h (+1/-0) tests/twisted/dispatcher/create-delayed-by-plugin.py (+0/-166) tests/twisted/dispatcher/dispatch-delayed-by-plugin.py (+0/-272) tests/twisted/dispatcher/dispatch-rejected-by-plugin.py (+0/-239) tools/Makefile.am (+43/-0) tools/Makefile.in (+465/-0) tools/c-constants-generator.xsl (+299/-0) tools/c-interfaces-generator.xsl (+84/-0) tools/doc-generator.xsl (+1199/-0) tools/glib-blocking-client-gen.py (+1014/-0) tools/glib-client-gen.py (+1184/-0) tools/glib-client-marshaller-gen.py (+59/-0) tools/glib-ginterface-gen.py (+767/-0) tools/glib-gtypes-generator.py (+285/-0) tools/glib-interfaces-body-generator.xsl (+47/-0) tools/glib-interfaces-generator.xsl (+55/-0) tools/glib-signals-marshal-gen.py (+55/-0) tools/gquark-gen.py (+135/-0) tools/header-checks.am (+9/-0) tools/identity.xsl (+7/-0) tools/lcov.am (+27/-0) tools/libglibcodegen.py (+171/-0) tools/libtpcodegen.py (+205/-0) tools/spec-to-introspect.xsl (+26/-0) tools/telepathy.am (+74/-0) util/Makefile.am (+29/-0) util/Makefile.in (+700/-0) util/mc-tool.1 (+216/-0) util/mc-tool.c (+1278/-0) util/mc-wait-for-name.1.in (+38/-0) util/wait-for-name.c (+144/-0) xml/Account_Interface_Addressing.xml (+0/-76) xml/Account_Interface_Compat.xml (+65/-0) xml/Account_Interface_Conditions.xml (+99/-0) xml/Account_Interface_External_Password_Storage.xml (+0/-52) xml/Account_Interface_Hidden.xml (+0/-46) xml/Account_Manager_Interface_Hidden.xml (+0/-101) xml/Account_Manager_Interface_Query.xml (+75/-0) xml/Channel_Dispatcher_Interface_Messages_DRAFT.xml (+0/-57) xml/Connection_Manager_Interface_Account_Storage.xml (+0/-117) xml/Makefile.am (+36/-0) xml/Makefile.in (+456/-0) xml/all.xml (+35/-0) xml/generic-types.xml (+214/-0) xml/nmc5.xml (+17/-0) xml/telepathy-types.xml (+96/-0) Path conflict: <deleted> / tools Path conflict: <deleted> / server Path conflict: <deleted> / src Path conflict: <deleted> / doc Path conflict: <deleted> / util Path conflict: <deleted> / m4 Path conflict: <deleted> / xml Conflict adding file debian/libmission-control-plugins0.symbols. Moved existing file to debian/libmission-control-plugins0.symbols.moved. Conflict adding files to doc. Created directory. Conflict because doc is not versioned, but has versioned children. Versioned directory. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding files to doc/reference. Created directory. Conflict because doc/reference is not versioned, but has versioned children. Versioned directory. Conflict adding files to m4. Created directory. Conflict because m4 is not versioned, but has versioned children. Versioned directory. Conflict adding file m4. Moved existing file to m4.moved. Conflict adding files to server. Created directory. Conflict because server is not versioned, but has versioned children. Versioned directory. Conflict adding file server. Moved existing file to server.moved. Conflict adding files to src. Created directory. Conflict because src is not versioned, but has versioned children. Versioned directory. Conflict adding file src. Moved existing file to src.moved. Path conflict: src.moved/channel-utils.c / <deleted> Path conflict: src.moved/channel-utils.h / <deleted> Contents conflict in src.moved/client-registry.c Path conflict: src.moved/client-registry.h / <deleted> Path conflict: src.moved/connectivity-monitor.c / src/connectivity-monitor.c Path conflict: src.moved/connectivity-monitor.h / src/connectivity-monitor.h Path conflict: src.moved/gtypes.c / src/gtypes.c Path conflict: src.moved/kludge-transport.c / src/kludge-transport.c Path conflict: src.moved/kludge-transport.h / src/kludge-transport.h Path conflict: src.moved/mcd-account-addressing.c / <deleted> Path conflict: src.moved/mcd-account-addressing.h / <deleted> Contents conflict in src.moved/mcd-account-manager-default.c Contents conflict in src.moved/mcd-account-manager-default.h Contents conflict in src.moved/mcd-account-manager-sso.c Contents conflict in src.moved/mcd-account-manager-sso.h Path conflict: src.moved/mcd-connection-service-points.c / <deleted> Path conflict: src.moved/mcd-connection-service-points.h / <deleted> Path conflict: src.moved/mcd-manager-priv.h / <deleted> Path conflict: src.moved/mcd-mission-priv.h / <deleted> Path conflict: src.moved/mcd-slacker.c / <deleted> Path conflict: src.moved/mcd-slacker.h / <deleted> Path conflict: src.moved/mcd-storage-ag-hidden.c / <deleted> Path conflict: src.moved/mcd-storage-ag-hidden.h / <deleted> Path conflict: src.moved/mcd-storage-priv.h / <deleted> Path conflict: src.moved/mcd-storage.c / <deleted> Path conflict: src.moved/mcd-storage.h / <deleted> Contents conflict in src.moved/plugin-account.c Path conflict: src.moved/plugin-account.h / <deleted> Path conflict: src.moved/plugin-dispatch-operation.c / <deleted> Path conflict: src.moved/plugin-dispatch-operation.h / <deleted> Path conflict: src.moved/plugin-loader.c / <deleted> Path conflict: src.moved/plugin-loader.h / <deleted> Path conflict: src.moved/plugin-request.c / <deleted> Path conflict: src.moved/plugin-request.h / <deleted> Contents conflict in src.moved/request.c Path conflict: src.moved/request.h / <deleted> Conflict adding files to tools. Created directory. Conflict because tools is not versioned, but has versioned children. Versioned directory. Conflict adding file tools. Moved existing file to tools.moved. Conflict adding files to util. Created directory. Conflict because util is not versioned, but has versioned children. Versioned directory. Conflict adding file util. Moved existing file to util.moved. Conflict adding files to xml. Created directory. Conflict because xml is not versioned, but has versioned children. Versioned directory. Conflict adding file xml. Moved existing file to xml.moved. Path conflict: xml.moved/Account_Interface_Addressing.xml / <deleted> Path conflict: xml.moved/Account_Interface_External_Password_Storage.xml / <deleted> Path conflict: xml.moved/Account_Interface_Hidden.xml / <deleted> Path conflict: xml.moved/Account_Manager_Interface_Hidden.xml / <deleted> Path conflict: xml.moved/Channel_Dispatcher_Interface_Messages_DRAFT.xml / <deleted> Path conflict: xml.moved/Connection_Manager_Interface_Account_Storage.xml / <deleted> |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/precise/telepathy-mission-control-5/precise-201111091815 |
| 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/telepathy-mission-control-5 reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/telepathy-mission-control-5/precise-201111091815. 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)
To post a comment you must log in.
Unmerged revisions
- 31. By Ken VanDine
-
releasing version 1:5.10.1-0ubuntu1
- 30. By Ken VanDine
-
* New upstream release.
* debian/patches/ 0001-fix- build-with- UPower- but-no- NM-or-ConnMan. patch
- dropped, fixed upstream - 29. By Ken VanDine
-
manually removed libmcclient, it didn't get dropped in the merge
- 28. By Ken VanDine
-
* merged from debian unstable, remaining changes:
- install apparmor profile
- apport hook
* d/p/0001-fix-build- with-UPower- but-no- NM-or-ConnMan. patch: Fix FTBFS when
built with UPower but without NM support (Closes: #644589)
* debian/control:
- Add myself to Uploaders list
- Build-depends on libnm-glib-dev only on linux-any arch
* debian/rules: Only build with NM support on linux architectures
* New upstream release.
* Enable NM and UPower support.
* debian/libmission- control- plugins0. symbols: Updated. - 27. By Ken VanDine
-
Merged debian branch attempting to fix conflicting file ids
- 26. By Ken VanDine
-
Merged debian branch attempting to fix conflicting file ids
- 25. By Ken VanDine
-
merged debian branch and attempted to fix file conflicts
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
