Merge-o-Matic

Merge lp:~juliank/merge-o-matic/skip-patches into lp:merge-o-matic

  1. skip-patches
  2. Merge into trunk
Proposed by Julian Andres Klode
Status: Merged
Merged at revision: 306
Proposed branch: lp:~juliank/merge-o-matic/skip-patches
Merge into: lp:merge-o-matic
Diff against target: 12 lines (+1/-1)
1 file modified
momlib.py (+1/-1)
To merge this branch: bzr merge lp:~juliank/merge-o-matic/skip-patches
Reviewer Review Type Date Requested Status
Colin Watson Approve
Simon Quigley Approve
Ubuntu Core Development Team Pending
Review via email: mp+336267@code.launchpad.net

Description of the change

MoM currently creates merges using the patches-applied state. This does not make a lot of sense, as the resulting tree often cannot be used as the patches are partially applied and the quilt stack is empty.

Let's just skip applying patches during unpack to fix this.

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) wrote :

LGTM

review: Approve
Revision history for this message
Colin Watson (cjwatson) wrote :

I would not be surprised to find this doing something odd, but on the other hand what we have at the moment doesn't really work right either, so ... *shrug*, let's go for it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'momlib.py'
2--- momlib.py 2018-01-17 13:38:33 +0000
3+++ momlib.py 2018-01-17 22:17:21 +0000
4@@ -564,7 +564,7 @@
5 try:
6 env = dict(os.environ)
7 env['DEB_VENDOR'] = distro
8- shell.run(("dpkg-source", "-x", dsc_file, destdir), chdir=srcdir,
9+ shell.run(("dpkg-source", "--skip-patches", "-x", dsc_file, destdir), chdir=srcdir,
10 env=env)
11 # Make sure we can at least read everything under .pc, which isn't
12 # automatically true with dpkg-dev 1.15.4.

Subscribers

People subscribed via source and target branches

to status/vote changes: