2456 2012-05-14 13:51:04 +0000 combo-layer: fail to handle empty merge commits 2015-05-12 08:32:07 +0000 1 1 7 Build System, Metadata & Runtime Meta-yocto meta-yocto unspecified x86 Multiple RESOLVED FIXED Low normal 1.9 1 otavio bluelightning poky.bs.watcher poky.watcher richard.purdie sgw --- --- No (bug/feature does not impact docs) oldest_to_newest 21341 0 otavio 2012-05-14 13:51:04 +0000 The combo-layer utility ought to update the commit hash to the merge commit otherwise in next call it will end doing a format-patch from the commit just before the merge and trying to reapply already commited ones. 50900 1 bluelightning 2015-05-12 08:32:07 +0000 This should finally be resolved by the following fix: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=dcb8f89723f809ceee9dbb0941a2cc5a43400e99