summaryrefslogtreecommitdiffstats
path: root/scripts/lnr
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-05-08 14:37:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 13:01:36 +0100
commite9ae2f8417d65eb3bce3f5811d3e017c3d0596b3 (patch)
tree9c7134dea7d9b29c0f10ccb8b8810a698858220a /scripts/lnr
parent12cc076832130f9b3a2658bc92458624d2924742 (diff)
downloadpoky-e9ae2f8417d65eb3bce3f5811d3e017c3d0596b3.tar.gz
combo-layer: improve merge commit handling
When the head of a branch is a merge commit, combo-layer did not record that commit as last_revision because it only considers applied patches, and the merge commit never gets applied. This causes problems when the merge commit leads to multiple patches and the commit id that gets recorded only reaches some of these patches. The next run then will try to re-apply the other patches. This special case is now detected and dealt with by bumping last_revision to the branch commit. The behavior where the head is a normal commit is intentionally not changed, because some users might prefer the traditional behavior. (From OE-Core rev: 701bcd52c208f22a9a6c48a11a35bcf1c4e413df) (From OE-Core rev: 1bc46199e569411150b050818ff17abc66f899f2) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lnr')
0 files changed, 0 insertions, 0 deletions