Merge lp:~ubuntu-branches/ubuntu/precise/geany/precise-201203210702 into lp:ubuntu/precise/geany

Proposed by Ubuntu Package Importer on 2012-03-21
Status: Rejected
Rejected by: James Westby on 2012-03-21
Proposed branch: lp:~ubuntu-branches/ubuntu/precise/geany/precise-201203210702
Merge into: lp:ubuntu/precise/geany
Diff against target: 21 lines (+15/-0) (has conflicts)
1 file modified
debian/patches/add_keywords.patch (+15/-0)
Conflict adding file debian/patches/add_keywords.patch.  Moved existing file to debian/patches/add_keywords.patch.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/precise/geany/precise-201203210702
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-03-21 Pending
Review via email: mp+98583@code.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/precise/geany reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/geany/precise-201203210702. 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

33. By Martin Pitt on 2012-03-19

releasing version 0.21.dfsg-1ubuntu4

32. By Martin Pitt on 2012-03-19

debian/patches/add_keywords.patch: Add search keywords (LP: #942154)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/patches/add_keywords.patch'
2--- debian/patches/add_keywords.patch 1970-01-01 00:00:00 +0000
3+++ debian/patches/add_keywords.patch 2012-03-21 07:06:45 +0000
4@@ -0,0 +1,15 @@
5+Description: Adds search keyworkds to .desktop file
6+Author: Michael Hall <mhall119@ubuntu.com>
7+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/geany/+bug/942154
8+Bug: https://sourceforge.net/tracker/?func=detail&aid=3495064&group_id=153444&atid=787794
9+Bug: https://github.com/geany/geany/pull/31
10+
11+Index: b/geany.desktop.in
12+===================================================================
13+--- a/geany.desktop.in
14++++ b/geany.desktop.in
15+@@ -10,3 +10,4 @@
16+ Categories=GTK;Development;IDE;
17+ MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff;
18+ StartupNotify=true
19++_Keywords=Code;Editor;Programming;
20
21=== renamed file 'debian/patches/add_keywords.patch' => 'debian/patches/add_keywords.patch.moved'

Subscribers

People subscribed via source and target branches

to all changes: