Ubuntu
eucalyptus package

Merge lp:~ubuntu-branches/ubuntu/lucid/eucalyptus/lucid-201003031429 into lp:ubuntu/lucid/eucalyptus

  1. Lucid (10.04)
  2. lucid-201003031429
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/eucalyptus/lucid-201003031429
Merge into: lp:ubuntu/lucid/eucalyptus
Diff against target: 36 lines (+10/-1) (has conflicts)
2 files modified
debian/changelog (+9/-0)
debian/source_eucalyptus.py (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/eucalyptus/lucid-201003031429
Reviewer Review Type Date Requested Status
Chuck Short Pending
Review via email: mp+20552@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

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

Reply
Revision history for this message
James Westby (james-w) wrote :

Hi Chuck,

Your change to the apport hook that was pushed to bzr
wasn't in the last upload, would you merge it in again?

Thanks,

James

Reply
Revision history for this message
Chuck Short (zulcss) wrote :

Sure

On Wed, 2010-03-03 at 16:50 +0000, James Westby wrote:
> Hi Chuck,
>
> Your change to the apport hook that was pushed to bzr
> wasn't in the last upload, would you merge it in again?
>
> Thanks,
>
> James
>

Reply

Unmerged revisions

128. By Chuck Short

debian/source_eucalyptus.py: Fix typo (LP: #520775)

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 2010-03-03 14:02:24 +0000
3+++ debian/changelog 2010-03-03 14:34:18 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 eucalyptus (1.6.2-0ubuntu7) lucid; urgency=low
7
8 [ Dustin Kirkland ]
9@@ -17,6 +18,14 @@
10
11 -- Thierry Carrez <thierry.carrez@ubuntu.com> Wed, 03 Mar 2010 14:02:24 +0100
12
13+=======
14+eucalyptus (1.6.2-0ubuntu7) lucid; urgency=low
15+
16+ * debian/source_eucalyptus.py: Fix typo (LP: #520775)
17+
18+ -- chuck <chuck@cartman> Mon, 01 Mar 2010 08:09:58 -0500
19+
20+>>>>>>> MERGE-SOURCE
21 eucalyptus (1.6.2-0ubuntu6) lucid; urgency=low
22
23 * debian/eucalyptus-cc.config, debian/eucalyptus-udeb.finish-install,
24
25=== modified file 'debian/source_eucalyptus.py'
26--- debian/source_eucalyptus.py 2010-01-27 09:01:56 +0000
27+++ debian/source_eucalyptus.py 2010-03-03 14:34:18 +0000
28@@ -10,7 +10,7 @@
29 version = ''
30 for package in packages:
31 try:
32- vesion = packaging.get_versions(package)
33+ vesion = packaging.get_version(package)
34 except ValueError:
35 version = 'N/A'
36 if version is None:

Subscribers

People subscribed via source and target branches

to all changes: