diff for duplicates of <8404.1717709883800685810@lists.openembedded.org> diff --git a/a/1.txt b/N1/1.txt index 9761ebd..1cb5c2e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -When i apply my patch in my git bash console i have no any error about "malformed diff lines". +When i apply and check my patch in my git bash console i have no any error about "malformed diff lines". Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master) -$ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch -Applying: archiver.bbclass: Fix work-shared checking for kernel recipes +$ git apply --check 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master) -$ +$ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch +Applying: archiver.bbclass: Fix work-shared checking for kernel recipes diff --git a/a/content_digest b/N1/content_digest index a37838d..042f35d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,17 @@ "ref\00101018fef5da2bb-20fddbbf-ef4e-4418-90d6-c2ec76ea132b-000000@us-west-2.amazonses.com\0" "From\0Livius <egyszeregy@freemail.hu>\0" "Subject\0Re: Patchtest results for [PATCH] archiver.bbclass: Fix work-shared checking for kernel recipes\0" - "Date\0Thu, 06 Jun 2024 14:38:03 -0700\0" + "Date\0Thu, 06 Jun 2024 14:41:28 -0700\0" "To\0openembedded-core@lists.openembedded.org\0" "\00:1\0" "b\0" - "When i apply my patch in my git bash console i have no any error about \"malformed diff lines\".\n" + "When i apply and check my patch in my git bash console i have no any error about \"malformed diff lines\".\n" "\n" "Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master)\n" - "$ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch\n" - "Applying: archiver.bbclass: Fix work-shared checking for kernel recipes\n" + "$ git apply --check 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch\n" "\n" "Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master)\n" - $ + "$ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch\n" + Applying: archiver.bbclass: Fix work-shared checking for kernel recipes -47558101f99983453ecca6f2faa9b3039c1755849ac8a8f397e80b749b25be17 +5de0134659dbbf2ba745d3772df86e300a00c45a27210b7c2e014e1ff988609f
diff --git a/a/1.txt b/N2/1.txt index 9761ebd..7aeb499 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,8 @@ -When i apply my patch in my git bash console i have no any error about "malformed diff lines". +When i apply and check my patch in my git bash console i have no any error about "malformed diff lines". -Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master) +Livius@DESKTOP-LIVIUS MINGW64 /d/Yocto/openembedded-core (master) +$ git apply --check 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch + +Livius@DESKTOP-LIVIUS MINGW64 /d/Yocto/openembedded-core (master) $ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch Applying: archiver.bbclass: Fix work-shared checking for kernel recipes - -Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master) -$ diff --git a/a/content_digest b/N2/content_digest index a37838d..051d146 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,17 @@ "ref\00101018fef5da2bb-20fddbbf-ef4e-4418-90d6-c2ec76ea132b-000000@us-west-2.amazonses.com\0" "From\0Livius <egyszeregy@freemail.hu>\0" "Subject\0Re: Patchtest results for [PATCH] archiver.bbclass: Fix work-shared checking for kernel recipes\0" - "Date\0Thu, 06 Jun 2024 14:38:03 -0700\0" + "Date\0Fri, 07 Jun 2024 01:26:30 -0700\0" "To\0openembedded-core@lists.openembedded.org\0" "\00:1\0" "b\0" - "When i apply my patch in my git bash console i have no any error about \"malformed diff lines\".\n" + "When i apply and check my patch in my git bash console i have no any error about \"malformed diff lines\".\n" "\n" - "Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master)\n" - "$ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch\n" - "Applying: archiver.bbclass: Fix work-shared checking for kernel recipes\n" + "Livius@DESKTOP-LIVIUS MINGW64 /d/Yocto/openembedded-core (master)\n" + "$ git apply --check 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch\n" "\n" - "Livius@DESKTOP-LIVIUS MINGW64 /d/Bosch/openembedded-core (master)\n" - $ + "Livius@DESKTOP-LIVIUS MINGW64 /d/Yocto/openembedded-core (master)\n" + "$ git am 0001-archiver.bbclass-Fix-work-shared-checking-for-kernel.patch\n" + Applying: archiver.bbclass: Fix work-shared checking for kernel recipes -47558101f99983453ecca6f2faa9b3039c1755849ac8a8f397e80b749b25be17 +e23d0a211998ac552bb533ae64d4a3433350211f2eee776a3a6dd453368aaf98
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox