Merge lp://staging/~sil2100/langpack-o-matic/multi_merge into lp://staging/langpack-o-matic

Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 545
Proposed branch: lp://staging/~sil2100/langpack-o-matic/multi_merge
Merge into: lp://staging/langpack-o-matic
Diff against target: 96 lines (+47/-31)
1 file modified
merge-tarballs (+47/-31)
To merge this branch: bzr merge lp://staging/~sil2100/langpack-o-matic/multi_merge
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+271954@code.staging.launchpad.net

Commit message

Modify the merge-tarballs to merge in multiple tarballs together, not limited to 2. This is useful for cases such as ubuntu-touch 15.04 series where we need to merge vivid full, vivid delta and the overlay.

Description of the change

Modify the merge-tarballs to merge in multiple tarballs together, not limited to 2. This is useful for cases such as ubuntu-touch 15.04 series where we need to merge vivid full, vivid delta and the overlay.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Some nits wrt. the temp dir cleanup. Thanks!

review: Needs Fixing
546. By Łukasz Zemczak

Try to deal with the issues rised by Martin

547. By Łukasz Zemczak

Fix indent

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

How about something like this for now?

Revision history for this message
Martin Pitt (pitti) wrote :

OK, thanks. I still hate that code (it's massively inefficient and hard to understand -- not your fault, but mine back then), but let's unblock this for now.

review: Approve

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