{"thread":{"id":"2796","subject":"t6021-merge-criss-cross.sh fails on some systems","startedAt":"2005-12-10T22:42:35Z","lastAt":"2005-12-11T08:12:02Z","messageCount":5,"participants":["David S. Miller","Fredrik Kuivinen","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"13464","messageId":"20051210.144235.125914760.davem@davemloft.net","threadId":"2796","inReplyTo":null,"subject":"t6021-merge-criss-cross.sh fails on some systems","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-12-10T22:42:35Z","receivedAt":"2005-12-10T22:42:35Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"\nThis is really weird, so I started to try and get some diagnostics.\n\nIt doesn't fail on my sparc64 box running debian-testing\nbut it does fail on my Ubuntu x86 laptop, a sparc64 box\nrunning debian-unstable, and an Ubuntu sparc64 system as\nwell.\n\nThis is with the current GIT tree.\n\nI ran the test one step at a time to try and get some diagnostics,\nhere's what fails:\n\ndavem@nuts:~/src/GIT/test$ git merge \"pre E3 merge\" B A\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\nMerging B with A\nMerging:\n1f14398f4c69d09ab1a4d53fe096ddec3ea45207 C3\nd1072ae2682fad309c493343c5d77c9897fb6afa B8\nfound 1 common ancestor(s):\n926159b75e3d9b240b1eae36eb1977b095ff2e1a Initial commit\nAuto-merging file\nTraceback (most recent call last):\n File \"/home/davem/bin/git-merge-recursive\", line 868, in ?\n firstBranch, secondBranch, graph)\n File \"/home/davem/bin/git-merge-recursive\", line 87, in merge\n branch1Name, branch2Name)\n File \"/home/davem/bin/git-merge-recursive\", line 160, in mergeTrees\n if not processEntry(entry, branch1Name, branch2Name):\n File \"/home/davem/bin/git-merge-recursive\", line 821, in processEntry\n branch1Name, branch2Name)\n File \"/home/davem/bin/git-merge-recursive\", line 212, in mergeFile\n src1, orig, src2], returnCode=True)\n File \"/home/davem/share/git-core/python/gitMergeCommon.py\", line 72, in runProgram\n raise ProgramError(progStr, e.strerror)\nProgramError: merge -L B/file -L orig/file -L A/file .merge_file_kDtaE3 .merge_file_K30Hgp .merge_file_frqYIs: No such file or directory\nNo merge strategy handled the merge.\ndavem@nuts:~/src/GIT/test$ ls\n\nIt looks like maybe some quoting issue? The call failing above is the\none in git-merge-recursive which looks like this:\n\n [dummy, clean] = merge(graph.shaMap[h1], graph.shaMap[h2],\n firstBranch, secondBranch, graph)\n\nAny ideas?\n"},{"id":"13467","messageId":"20051211003353.GA27207@c165.ib.student.liu.se","threadId":"2796","inReplyTo":"20051210.144235.125914760.davem@davemloft.net","subject":"Re: t6021-merge-criss-cross.sh fails on some systems","fromName":"Fredrik Kuivinen","fromEmail":"freku045@student.liu.se","sentAt":"2005-12-11T00:33:53Z","receivedAt":"2005-12-11T00:33:53Z","isPatch":false,"sender":{"key":"frekui@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13770967?v=4"},"body":"On Sat, Dec 10, 2005 at 02:42:35PM -0800, David S. Miller wrote:\n> \n> This is really weird, so I started to try and get some diagnostics.\n> \n> It doesn't fail on my sparc64 box running debian-testing\n> but it does fail on my Ubuntu x86 laptop, a sparc64 box\n> running debian-unstable, and an Ubuntu sparc64 system as\n> well.\n> \n> This is with the current GIT tree.\n> \n> I ran the test one step at a time to try and get some diagnostics,\n> here's what fails:\n> \n> davem@nuts:~/src/GIT/test$ git merge \"pre E3 merge\" B A\n> Trying really trivial in-index merge...\n> fatal: Merge requires file-level merging\n> Nope.\n> Merging B with A\n> Merging:\n> 1f14398f4c69d09ab1a4d53fe096ddec3ea45207 C3\n> d1072ae2682fad309c493343c5d77c9897fb6afa B8\n> found 1 common ancestor(s):\n> 926159b75e3d9b240b1eae36eb1977b095ff2e1a Initial commit\n> Auto-merging file\n> Traceback (most recent call last):\n> File \"/home/davem/bin/git-merge-recursive\", line 868, in ?\n> firstBranch, secondBranch, graph)\n> File \"/home/davem/bin/git-merge-recursive\", line 87, in merge\n> branch1Name, branch2Name)\n> File \"/home/davem/bin/git-merge-recursive\", line 160, in mergeTrees\n> if not processEntry(entry, branch1Name, branch2Name):\n> File \"/home/davem/bin/git-merge-recursive\", line 821, in processEntry\n> branch1Name, branch2Name)\n> File \"/home/davem/bin/git-merge-recursive\", line 212, in mergeFile\n> src1, orig, src2], returnCode=True)\n> File \"/home/davem/share/git-core/python/gitMergeCommon.py\", line 72, in runProgram\n> raise ProgramError(progStr, e.strerror)\n> ProgramError: merge -L B/file -L orig/file -L A/file .merge_file_kDtaE3 .merge_file_K30Hgp .merge_file_frqYIs: No such file or directory\n> No merge strategy handled the merge.\n> davem@nuts:~/src/GIT/test$ ls\n> \n> It looks like maybe some quoting issue? The call failing above is the\n> one in git-merge-recursive which looks like this:\n> \n> [dummy, clean] = merge(graph.shaMap[h1], graph.shaMap[h2],\n> firstBranch, secondBranch, graph)\n> \n> Any ideas?\n\nIt looks like 'merge' can't be found. The recursive merge strategy\nuses 'merge' to do file-level merging. Do you have merge(1) installed?\n\n- Fredrik\n"},{"id":"13475","messageId":"20051210.235818.90276521.davem@davemloft.net","threadId":"2796","inReplyTo":"20051211003353.GA27207@c165.ib.student.liu.se","subject":"Re: t6021-merge-criss-cross.sh fails on some systems","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-12-11T07:58:18Z","receivedAt":"2005-12-11T07:58:18Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Fredrik Kuivinen \nDate: Sun, 11 Dec 2005 01:33:53 +0100\n\n> It looks like 'merge' can't be found. The recursive merge strategy\n> uses 'merge' to do file-level merging. Do you have merge(1)\n> installed?\n\nYet another weird dependency. :-/ Thanks for the info.\n\nI bet a tiny shell script could run at GIT build time\nto check for the presence of these necessary items. :-)\nYes, the debian/rpm/etc. packaging dependencies will catch\nthis, but a lot of us are doing:\n\ngit pull && make && make test && make install\n\n:-)\n"},{"id":"13477","messageId":"7v64pwoy45.fsf@assigned-by-dhcp.cox.net","threadId":"2796","inReplyTo":"20051210.235818.90276521.davem@davemloft.net","subject":"Re: t6021-merge-criss-cross.sh fails on some systems","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-11T08:07:38Z","receivedAt":"2005-12-11T08:07:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"David S. Miller\" writes:\n\n> ... but a lot of us are doing:\n>\n> git pull && make && make test && make install\n\nFair enough.\n\nNext such round would fail at \"make test\" stage with t0000;\notherwise please let me know\n"},{"id":"13478","messageId":"20051211.001202.29022250.davem@davemloft.net","threadId":"2796","inReplyTo":"7v64pwoy45.fsf@assigned-by-dhcp.cox.net","subject":"Re: t6021-merge-criss-cross.sh fails on some systems","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-12-11T08:12:02Z","receivedAt":"2005-12-11T08:12:02Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Junio C Hamano \nDate: Sun, 11 Dec 2005 00:07:38 -0800\n\n> Next such round would fail at \"make test\" stage with t0000;\n> otherwise please let me know\n\nt0000-basic.sh looks wonderful, thanks :)\n"}]}