From 80a74318de40be4648d0aa69e1e44db754e5be89 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 1 Feb 2017 10:30:29 -0500 Subject: kern-tools: re-enable scc merge command The ability to merge two branches directly from a .scc file was dropped during the streamlining of the tools. As was pointed out by David Vincent , there is once again a valid use case for this functionality, so we restore the capability. (From OE-Core rev: a0059ebbb52c659282e355664bba1a2fa282170e) Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-kernel/kern-tools/kern-tools-native_git.bb') diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 9e3e968a46..4b1de5752c 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1b DEPENDS = "git-native" -SRCREV = "bf2942f7559d114e96f7c7f1287bf7e5120632a3" +SRCREV = "c14440d4e7ae0160c260ed65c3e123be5dc97ae8" PR = "r12" PV = "0.2+git${SRCPV}" -- cgit v1.2.3-54-g00ecf