Ubuntu
cloud-utils package

Merge lp:~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223 into lp:ubuntu/lucid/cloud-utils

  1. Lucid (10.04)
  2. lucid-201003302223
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223
Merge into: lp:ubuntu/lucid/cloud-utils
Diff against target: 20 lines (+5/-0) (has conflicts)
1 file modified
debian/changelog (+5/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223

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/lucid/cloud-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/cloud-utils/lucid-201003302223. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

12. By Dustin Kirkland <kirkland@x200>

merge

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-25 21:53:59 +0000
3+++ debian/changelog 2010-03-30 22:28:20 +0000
4@@ -70,7 +70,11 @@
5
6 * Fix package versioning
7
8+<<<<<<< TREE
9 -- Dustin Kirkland < kirkland@ubuntu.com> Thu, 18 Feb 2010 15:04:39 -0600
10+=======
11+ -- Dustin Kirkland <kirkland@ubuntu.com> Thu, 18 Feb 2010 15:04:39 -0600
12+>>>>>>> MERGE-SOURCE
13
14 cloud-utils (0.3ubuntu1) lucid; urgency=low
15
16@@ -106,3 +110,4 @@
17 * Initial release.
18
19 -- Scott Moser <smoser@ubuntu.com> Fri, 05 Feb 2010 18:37:57 -0500
20+

Subscribers

People subscribed via source and target branches

to all changes: