Ubuntu
ibus package

Merge lp:~ubuntu-branches/ubuntu/natty/ibus/natty-201101182042 into lp:ubuntu/natty/ibus

  1. Natty (11.04)
  2. natty-201101182042
  3. Merge into natty
Proposed by James Westby
Status: Work in progress
Proposed branch: lp:~ubuntu-branches/ubuntu/natty/ibus/natty-201101182042
Merge into: lp:ubuntu/natty/ibus
Diff against target: 23 lines (+9/-0) (has conflicts)
1 file modified
debian/changelog (+9/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/natty/ibus/natty-201101182042
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+46677@code.launchpad.net

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/ibus now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/ibus/natty-201101182042. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

27. By Ken VanDine

releasing version 1.3.7-1ubuntu5

26. By Ken VanDine

releasing version 1.3.7-1ubuntu4

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-01-07 10:33:02 +0000
3+++ debian/changelog 2011-01-18 20:47:31 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 ibus (1.3.9-0ubuntu1) natty; urgency=low
7
8 * New upstream release
9@@ -40,6 +41,14 @@
10
11 -- Ken VanDine <ken.vandine@canonical.com> Tue, 16 Nov 2010 13:21:39 -0500
12
13+=======
14+ibus (1.3.7-1ubuntu5) natty; urgency=low
15+
16+ * Version bump for natty upload
17+
18+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 16 Nov 2010 13:21:39 -0500
19+
20+>>>>>>> MERGE-SOURCE
21 ibus (1.3.7-1ubuntu4) maverick-proposed; urgency=low
22
23 [ Karl Lattimer ]

Subscribers

People subscribed via source and target branches

to all changes: