{"thread":{"id":"2755","subject":"[BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file","startedAt":"2005-12-06T14:03:38Z","lastAt":"2005-12-06T16:51:06Z","messageCount":3,"participants":["Jon Loeliger","Fredrik Kuivinen","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"13264","messageId":"E1EjdPu-00034z-Hu@jdl.com","threadId":"2755","inReplyTo":null,"subject":"[BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2005-12-06T14:03:38Z","receivedAt":"2005-12-06T14:03:38Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"\nSo, I was surprised by this display this morning.\n(I swear I'm trying to help! :-)\n\nI grabbed new (7:30 CST Dec 6) top-of-git, built and installed it.\nI then \"git checkout jdl\" and \"git pull . origin\" to bring my\nbranch up to date. It looked like this just before the pull\ninto branch \"jdl\":\n\njdl@ubuntu:/usr/src/git-core$ git show-branch jdl master origin\n* [jdl] Added documentation for few missing options.\n ! [master] git-merge-one-file: resurrect leading path creation.\n ! [origin] git-merge-one-file: resurrect leading path creation.\n---\n ++ [master] git-merge-one-file: resurrect leading path creation.\n ++ [master^] Documentaiton (read-tree): update description of 3-way\n ++ [master~2] Documentation: hash-object.\n ++ [master~3] write-tree: check extra arguments and die but be a bit more helpful.\n ++ [master~4] init-db: check extra arguments and complain.\n ++ [master~5] hash-object: -- and --help\n ++ [master~6] Added documentation for few missing options.\n+ [jdl] Added documentation for few missing options.\n+ [jdl^] Merge branch 'origin'\n+++ [master~7] git-mv to work with Perl 5.6\n\njdl@ubuntu:/usr/src/git-core$ git status\n# On branch refs/heads/jdl\nnothing to commit\n\njdl@ubuntu:/usr/src/git-core$ git pull . origin\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\nMerging HEAD with be61db922a230ae2638c27c071ee4b8c98f01f72\nMerging:\n4baf91676c2462796137e93917c75f2e14ebb877 Added documentation for few missing options.\nbe61db922a230ae2638c27c071ee4b8c98f01f72 git-merge-one-file: resurrect leading path creation.\nfound 1 common ancestor(s):\n23c99d84601316c1e51ebc1f0b9bec5cddd011fb git-mv to work with Perl 5.6\nAuto-merging Documentation/git-read-tree.txt\nTraceback (most recent call last):\n File \"/home/jdl/bin/git-merge-recursive\", line 868, in ?\n firstBranch, secondBranch, graph)\n File \"/home/jdl/bin/git-merge-recursive\", line 87, in merge\n branch1Name, branch2Name)\n File \"/home/jdl/bin/git-merge-recursive\", line 160, in mergeTrees\n if not processEntry(entry, branch1Name, branch2Name):\n File \"/home/jdl/bin/git-merge-recursive\", line 821, in processEntry\n branch1Name, branch2Name)\n File \"/home/jdl/bin/git-merge-recursive\", line 212, in mergeFile\n src1, orig, src2], returnCode=True)\n File \"/home/jdl/share/git-core/python/gitMergeCommon.py\", line 72, in runProgram\n raise ProgramError(progStr, e.strerror)\nProgramError: merge -L HEAD/Documentation/git-read-tree.txt -L orig/Documentation/git-read-tree.txt -L be61db922a230ae2638c27c071ee4b8c98f01f72/Documentation/git-read-tree.txt .merge_file_DamWnQ .merge_file_U9K5YP .merge_file_4CPoEQ: No such file or directory\nNo merge strategy handled the merge.\n\njdl@ubuntu:/usr/src/git-core$ ll Documentation/git-read-tree.txt .merge*\n12 -rw-r--r-- 1 jdl jdl 10464 2005-12-06 07:46 Documentation/git-read-tree.txt\n12 -rw------- 1 jdl jdl 11469 2005-12-06 07:47 .merge_file_4CPoEQ\n12 -rw------- 1 jdl jdl 10464 2005-12-06 07:47 .merge_file_DamWnQ\n12 -rw------- 1 jdl jdl 10339 2005-12-06 07:47 .merge_file_U9K5YP\n\n\njdl@ubuntu:/usr/src/git-core$ git status\n# On branch refs/heads/jdl\n#\n# Updated but not checked in:\n# (will commit)\n#\n# modified: Documentation/git-hash-object.txt\n# modified: git-merge-one-file.sh\n# modified: hash-object.c\n# modified: init-db.c\n# modified: write-tree.c\n#\n#\n# Changed but not updated:\n# (use git-update-index to mark for commit)\n#\n# unmerged: Documentation/git-read-tree.txt\n# modified: Documentation/git-read-tree.txt\n#\n#\n# Untracked files:\n# (use \"git add\" to add to commit)\n#\n# .merge_file_4CPoEQ\n# .merge_file_DamWnQ\n# .merge_file_U9K5YP\n"},{"id":"13265","messageId":"20051206163314.GA6112@c165.ib.student.liu.se","threadId":"2755","inReplyTo":"E1EjdPu-00034z-Hu@jdl.com","subject":"Re: [BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file","fromName":"Fredrik Kuivinen","fromEmail":"freku045@student.liu.se","sentAt":"2005-12-06T16:33:14Z","receivedAt":"2005-12-06T16:33:14Z","isPatch":false,"sender":{"key":"frekui@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13770967?v=4"},"body":"On Tue, Dec 06, 2005 at 08:03:38AM -0600, Jon Loeliger wrote:\n> \n> jdl@ubuntu:/usr/src/git-core$ git pull . origin\n> Trying really trivial in-index merge...\n> fatal: Merge requires file-level merging\n> Nope.\n> Merging HEAD with be61db922a230ae2638c27c071ee4b8c98f01f72\n> Merging:\n> 4baf91676c2462796137e93917c75f2e14ebb877 Added documentation for few missing options.\n> be61db922a230ae2638c27c071ee4b8c98f01f72 git-merge-one-file: resurrect leading path creation.\n> found 1 common ancestor(s):\n> 23c99d84601316c1e51ebc1f0b9bec5cddd011fb git-mv to work with Perl 5.6\n> Auto-merging Documentation/git-read-tree.txt\n> Traceback (most recent call last):\n> File \"/home/jdl/bin/git-merge-recursive\", line 868, in ?\n> firstBranch, secondBranch, graph)\n> File \"/home/jdl/bin/git-merge-recursive\", line 87, in merge\n> branch1Name, branch2Name)\n> File \"/home/jdl/bin/git-merge-recursive\", line 160, in mergeTrees\n> if not processEntry(entry, branch1Name, branch2Name):\n> File \"/home/jdl/bin/git-merge-recursive\", line 821, in processEntry\n> branch1Name, branch2Name)\n> File \"/home/jdl/bin/git-merge-recursive\", line 212, in mergeFile\n> src1, orig, src2], returnCode=True)\n> File \"/home/jdl/share/git-core/python/gitMergeCommon.py\", line 72, in runProgram\n> raise ProgramError(progStr, e.strerror)\n> ProgramError: merge -L HEAD/Documentation/git-read-tree.txt -L orig/Documentation/git-read-tree.txt -L be61db922a230ae2638c27c071ee4b8c98f01f72/Documentation/git-read-tree.txt .merge_file_DamWnQ .merge_file_U9K5YP .merge_file_4CPoEQ: No such file or directory\n> No merge strategy handled the merge.\n> \n\nIt seems that changes has been committed to\nDocumentation/git-read-tree.txt in both the jdl branch and in\norigin. This shouldn't cause any problems but git-merge-recursive\n(which currently is the default merge strategy) uses merge(1) to do\nthe file-level merging and it seems like merge(1) can't be found on\nyour system.\n\nDo you have merge(1) installed? More appropriately, is merge in your\npath? If it isn't installed it can usually be found in the rcs package\nin your distribution.\n\n\n- Fredrik\n"},{"id":"13267","messageId":"7v64q241ad.fsf@assigned-by-dhcp.cox.net","threadId":"2755","inReplyTo":"E1EjdPu-00034z-Hu@jdl.com","subject":"Re: [BUG] ProgramError: merge ... .merge_file_4CPoEQ: No such file","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-06T16:51:06Z","receivedAt":"2005-12-06T16:51:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jon Loeliger writes:\n\n> So, I was surprised by this display this morning.\n> (I swear I'm trying to help! :-)\n\nThanks. I actually saw this myself yesterday.\n\nI have this strange feeling that you do not have \"merge\"\ninstalled on your cygwin box. It is part of \"rcs\".\n"}]}