Merge lp://qastaging/~sergiusens/snapcraft/conflicts into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Sergio Schvezov
| Status: | Merged |
|---|---|
| Approved by: | John Lenton |
| Approved revision: | 174 |
| Merged at revision: | 172 |
| Proposed branch: | lp://qastaging/~sergiusens/snapcraft/conflicts |
| Merge into: | lp://qastaging/~snappy-dev/snapcraft/core |
| Prerequisite: | lp://qastaging/~sergiusens/snapcraft/stage_snap_spec |
| Diff against target: |
202 lines (+52/-18) 10 files modified
examples/webcam-webui/snapcraft.yaml (+3/-6) integration-tests/data/conflicts/p2/Makefile (+8/-0) integration-tests/data/conflicts/p2/test.c (+4/-0) integration-tests/data/conflicts/snapcraft.yaml (+1/-1) integration-tests/units/jobs.pxu (+1/-1) snapcraft/cmds.py (+13/-4) snapcraft/plugin.py (+3/-2) snapcraft/plugins/python2.py (+5/-0) snapcraft/plugins/python3.py (+5/-0) snapcraft/tests/test_cmds.py (+9/-4) |
| To merge this branch: | bzr merge lp://qastaging/~sergiusens/snapcraft/conflicts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John Lenton (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Conflicting files that are essentially the same file should not cause problems
Description of the change
This came up after a review, it is of most use for stage-packages.
To post a comment you must log in.
Revision history for this message
| Sergio Schvezov (sergiusens) wrote | # |
Revision history for this message
| John Lenton (chipaca) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Needs fixing, probably. See comments.