dee

Merge lp://qastaging/~mhr3/dee/more-sugar into lp://qastaging/dee

  1. more-sugar
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 310
Merged at revision: 311
Proposed branch: lp://qastaging/~mhr3/dee/more-sugar
Merge into: lp://qastaging/dee
Diff against target: 37 lines (+6/-4)
2 files modified
vapi/Dee-0.5-custom.vala (+5/-3)
vapi/dee-1.0.vapi (+1/-1)
To merge this branch: bzr merge lp://qastaging/~mhr3/dee/more-sugar
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+83261@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Can we please hold this off until we've landed the tree-index
branch,as it'll cause conflicts?

Alternatively propose it for merging into the tree-index branch

Revision history for this message
Michal Hruby (mhr3) wrote :

It's too small to cause conflicts ;) But sure let's do the tree-index first.

Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looks good

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:dee failed due to conflicts:

text conflict in vapi/Dee-0.5-custom.vala

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-dee/8/console reported an error when processing this lp:~mhr3/dee/more-sugar branch.
Not merging it.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Reset to approved

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: