Merge lp://staging/~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201109221311 into lp://staging/ubuntu/oneiric/gnome-shell

Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp://staging/~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201109221311
Merge into: lp://staging/ubuntu/oneiric/gnome-shell
Diff against target: 564 lines (+544/-0) (has conflicts)
2 files modified
data/org.gnome.shell.gschema.xml.in (+4/-0)
js/ui/keyboard.js (+540/-0)
Text conflict in data/org.gnome.shell.gschema.xml.in
Contents conflict in js/ui/keyboard.js
To merge this branch: bzr merge lp://staging/~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201109221311
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+76580@code.staging.launchpad.net

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/oneiric/gnome-shell reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-201109221311. 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://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

44. By Martin Pitt

releasing version 3.1.92-0ubuntu1

43. By Martin Pitt

debian/control.in: Add libjson-glib-dev build dependency as per
configure.ac.

42. By Martin Pitt

* New upstream release.
  - Adds browser plugin for installing, enabling, disabling, and
    uninstalling shell extensions. (Note that extensions.gnome.org
    isn't yet in operation.)
  - Lots of bugfixes
* debian/control.in:
  - Depend on caribou libraries
  - Recommend gnome-session-fallback, needed when graphics support
    test fails (LP: #852950)
  - Bump minimum gjs dependency to 1.29.18 and minimum mutter
    to 3.1.92
* debian/patches/01_favorite_apps.patch: Updated
* debian/patches/04_build-without-caribou.patch: Dropped

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: