{"thread":{"id":"21916","subject":"rerere failed to parse conflict hunks","startedAt":"2009-12-09T08:46:48Z","lastAt":"2009-12-09T10:00:38Z","messageCount":3,"participants":["Uwe Kleine-König","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"129611","messageId":"20091209084648.GA30139@pengutronix.de","threadId":"21916","inReplyTo":null,"subject":"rerere failed to parse conflict hunks","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2009-12-09T08:46:48Z","receivedAt":"2009-12-09T08:46:48Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Hello,\n\nI just tried to merge linux-next\n(5c1af82119f11c5b322156b09d38cc37318849c4) into my private tree\n(based on 2b876f95d03e226394b5d360c86127cbefaf614b) and this\nhappened:\n\n\t...\n\tRemoving sound/soc/au1x/sample-ac97.c\n\tRecorded preimage for 'arch/Kconfig'\n\tRecorded preimage for 'arch/arm/mach-s3c2440/mach-anubis.c'\n\tRecorded preimage for 'arch/arm/plat-mxc/Makefile'\n\terror: Could not parse conflict hunks in arch/arm/plat-s3c/dev-hsmmc2.c\n\tRecorded preimage for 'arch/arm/plat-s3c/include/plat/sdhci.h'\n\tRecorded preimage for 'arch/arm/plat-samsung/Kconfig'\n\tRecorded preimage for 'arch/x86/include/asm/x86_init.h'\n\tRecorded preimage for 'arch/x86/kernel/x86_init.c'\n\tRecorded preimage for 'drivers/net/wireless/ray_cs.c'\n\tRecorded preimage for 'kernel/Makefile'\n\tRecorded preimage for 'kernel/power/hibernate.c'\n\tRecorded preimage for 'net/sctp/sysctl.c'\n\tAutomatic merge failed; fix conflicts and then commit the result.\n\nIf you are interested, I can provide you the two trees above.  When\nreproducing the line \"error: ...\" came later, but is still present.\n\nI guess this should be reproduceable with\n\n\tgit clone -n git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n\tcd linux-2.6\n\tgit remote add -f next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git\n\tgit checkout 2b876f95d03e226394b5d360c86127cbefaf614b\n\tgit merge 5c1af82119f11c5b322156b09d38cc37318849c4\n\nI havn't tried though.\n\nThe only non-trivial conflict is:\n\n\t#include <plat/sdhci.h>\n\t#include <plat/devs.h>\n\t<<<<<<< HEAD\n\t=======\n\t<<<<<<< HEAD\n\t#include <plat/cpu.h>\n\t=======\n\t>>>>>>> next-s5pc1xx\n\t>>>>>>> next/master\n\nBest regards\nUwe\n\n-- \nPengutronix e.K.                              | Uwe Kleine-König            |\nIndustrial Linux Solutions                    | http://www.pengutronix.de/  |\n"},{"id":"129618","messageId":"4B1F721E.9050609@drmicha.warpmail.net","threadId":"21916","inReplyTo":"20091209084648.GA30139@pengutronix.de","subject":"Re: rerere failed to parse conflict hunks","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2009-12-09T09:47:10Z","receivedAt":"2009-12-09T09:47:10Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Uwe Kleine-König venit, vidit, dixit 09.12.2009 09:46:\n> Hello,\n> \n> I just tried to merge linux-next\n> (5c1af82119f11c5b322156b09d38cc37318849c4) into my private tree\n> (based on 2b876f95d03e226394b5d360c86127cbefaf614b) and this\n> happened:\n> \n> \t...\n> \tRemoving sound/soc/au1x/sample-ac97.c\n> \tRecorded preimage for 'arch/Kconfig'\n> \tRecorded preimage for 'arch/arm/mach-s3c2440/mach-anubis.c'\n> \tRecorded preimage for 'arch/arm/plat-mxc/Makefile'\n> \terror: Could not parse conflict hunks in arch/arm/plat-s3c/dev-hsmmc2.c\n> \tRecorded preimage for 'arch/arm/plat-s3c/include/plat/sdhci.h'\n> \tRecorded preimage for 'arch/arm/plat-samsung/Kconfig'\n> \tRecorded preimage for 'arch/x86/include/asm/x86_init.h'\n> \tRecorded preimage for 'arch/x86/kernel/x86_init.c'\n> \tRecorded preimage for 'drivers/net/wireless/ray_cs.c'\n> \tRecorded preimage for 'kernel/Makefile'\n> \tRecorded preimage for 'kernel/power/hibernate.c'\n> \tRecorded preimage for 'net/sctp/sysctl.c'\n> \tAutomatic merge failed; fix conflicts and then commit the result.\n> \n> If you are interested, I can provide you the two trees above.  When\n> reproducing the line \"error: ...\" came later, but is still present.\n> \n> I guess this should be reproduceable with\n> \n> \tgit clone -n git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> \tcd linux-2.6\n> \tgit remote add -f next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git\n> \tgit checkout 2b876f95d03e226394b5d360c86127cbefaf614b\n> \tgit merge 5c1af82119f11c5b322156b09d38cc37318849c4\n> \n> I havn't tried though.\n> \n> The only non-trivial conflict is:\n> \n> \t#include <plat/sdhci.h>\n> \t#include <plat/devs.h>\n> \t<<<<<<< HEAD\n> \t=======\n> \t<<<<<<< HEAD\n> \t#include <plat/cpu.h>\n> \t=======\n> \t>>>>>>> next-s5pc1xx\n> \t>>>>>>> next/master\n> \n\nSomeone committed a file with conflict markers. Bad bad boy. I guess\na8c4f01 (fixup sdhci merge failure, 2009-11-23) did not quite what it\npromised.\n\nMichael\n"},{"id":"129619","messageId":"20091209100038.GD23236@pengutronix.de","threadId":"21916","inReplyTo":"4B1F721E.9050609@drmicha.warpmail.net","subject":"Re: rerere failed to parse conflict hunks","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2009-12-09T10:00:38Z","receivedAt":"2009-12-09T10:00:38Z","isPatch":false,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"\nBest regards\nUwe\n\nOn Wed, Dec 09, 2009 at 10:47:10AM +0100, Michael J Gruber wrote:\n> Uwe Kleine-König venit, vidit, dixit 09.12.2009 09:46:\n> > Hello,\n> > \n> > I just tried to merge linux-next\n> > (5c1af82119f11c5b322156b09d38cc37318849c4) into my private tree\n> > (based on 2b876f95d03e226394b5d360c86127cbefaf614b) and this\n> > happened:\n> > \n> > \t...\n> > \tRemoving sound/soc/au1x/sample-ac97.c\n> > \tRecorded preimage for 'arch/Kconfig'\n> > \tRecorded preimage for 'arch/arm/mach-s3c2440/mach-anubis.c'\n> > \tRecorded preimage for 'arch/arm/plat-mxc/Makefile'\n> > \terror: Could not parse conflict hunks in arch/arm/plat-s3c/dev-hsmmc2.c\n> > \tRecorded preimage for 'arch/arm/plat-s3c/include/plat/sdhci.h'\n> > \tRecorded preimage for 'arch/arm/plat-samsung/Kconfig'\n> > \tRecorded preimage for 'arch/x86/include/asm/x86_init.h'\n> > \tRecorded preimage for 'arch/x86/kernel/x86_init.c'\n> > \tRecorded preimage for 'drivers/net/wireless/ray_cs.c'\n> > \tRecorded preimage for 'kernel/Makefile'\n> > \tRecorded preimage for 'kernel/power/hibernate.c'\n> > \tRecorded preimage for 'net/sctp/sysctl.c'\n> > \tAutomatic merge failed; fix conflicts and then commit the result.\n> > \n> > If you are interested, I can provide you the two trees above.  When\n> > reproducing the line \"error: ...\" came later, but is still present.\n> > \n> > I guess this should be reproduceable with\n> > \n> > \tgit clone -n git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n> > \tcd linux-2.6\n> > \tgit remote add -f next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git\n> > \tgit checkout 2b876f95d03e226394b5d360c86127cbefaf614b\n> > \tgit merge 5c1af82119f11c5b322156b09d38cc37318849c4\n> > \n> > I havn't tried though.\n> > \n> > The only non-trivial conflict is:\n> > \n> > \t#include <plat/sdhci.h>\n> > \t#include <plat/devs.h>\n> > \t<<<<<<< HEAD\n> > \t=======\n> > \t<<<<<<< HEAD\n> > \t#include <plat/cpu.h>\n> > \t=======\n> > \t>>>>>>> next-s5pc1xx\n> > \t>>>>>>> next/master\n> > \n> \n> Someone committed a file with conflict markers. Bad bad boy. I guess\n> a8c4f01 (fixup sdhci merge failure, 2009-11-23) did not quite what it\n> promised.\nobviously, yes.\n\nBen, you might want to redo commit a8c4f018ba69266aeb3cccf73c36b6663189e730\n\nBest regards\nUwe\n\n-- \nPengutronix e.K.                              | Uwe Kleine-König            |\nIndustrial Linux Solutions                    | http://www.pengutronix.de/  |\n"}]}