{"thread":{"id":"2453","subject":"merge-recursive: include heapq?","startedAt":"2005-11-11T14:23:04Z","lastAt":"2005-11-11T19:26:39Z","messageCount":4,"participants":["Johannes Schindelin","Alex Riesen","Andrew Vasquez","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11590","messageId":"Pine.LNX.4.63.0511111520260.7575@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2453","inReplyTo":null,"subject":"merge-recursive: include heapq?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-11T14:23:04Z","receivedAt":"2005-11-11T14:23:04Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nI get this when pulling:\n\n-- snip --\nTraceback (most recent call last):\n File \"./git-merge-recursive\", line 4, in ?\n from heapq import heappush, heappop\nImportError: No module named heapq\n-- snap --\n\nOkay, my python is *old*:\n\n$ python -V\nPython 2.2.1\n\nIs it worthwhile to include heapq as we did with subprocess? Or should I \nupgrade...\n\nCiao,\nDscho\n"},{"id":"11619","messageId":"20051111185246.GB13524@steel.home","threadId":"2453","inReplyTo":"Pine.LNX.4.63.0511111520260.7575@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: merge-recursive: include heapq?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2005-11-11T18:52:46Z","receivedAt":"2005-11-11T18:52:46Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Johannes Schindelin, Fri, Nov 11, 2005 15:23:04 +0100:\n> I get this when pulling:\n> \n> -- snip --\n> Traceback (most recent call last):\n> File \"./git-merge-recursive\", line 4, in ?\n> from heapq import heappush, heappop\n> ImportError: No module named heapq\n> -- snap --\n> \n> Okay, my python is *old*:\n> \n> $ python -V\n> Python 2.2.1\n> \n> Is it worthwhile to include heapq as we did with subprocess? Or should I \n> upgrade...\n\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\nTraceback (most recent call last):\n File \"/home/raa/bin/git-merge-recursive\", line 8, in ?\n from gitMergeCommon import *\n File \"/home/raa/share/git-core/python/gitMergeCommon.py\", line 14, in ?\n import subprocess\nImportError: No module named subprocess\nAutomatic merge failed/prevented; fix up by hand\n\nThat said, I thought an upgrade was worth it and upgraded my 2.3 to 2.4 :)\n"},{"id":"11620","messageId":"20051111190926.GD458@andrew-vasquezs-powerbook-g4-15.local","threadId":"2453","inReplyTo":"20051111185246.GB13524@steel.home","subject":"Re: merge-recursive: include heapq?","fromName":"Andrew Vasquez","fromEmail":"andrew.vasquez@qlogic.com","sentAt":"2005-11-11T19:09:26Z","receivedAt":"2005-11-11T19:09:26Z","isPatch":false,"sender":{"key":"andrew.vasquez@qlogic.com","avatar":null},"body":"On Fri, 11 Nov 2005, Alex Riesen wrote:\n> Johannes Schindelin, Fri, Nov 11, 2005 15:23:04 +0100:\n> > I get this when pulling:\n> > \n> > -- snip --\n> > Traceback (most recent call last):\n> > File \"./git-merge-recursive\", line 4, in ?\n> > from heapq import heappush, heappop\n> > ImportError: No module named heapq\n> > -- snap --\n> > \n> > Okay, my python is *old*:\n> > \n> > $ python -V\n> > Python 2.2.1\n> > \n> > Is it worthwhile to include heapq as we did with subprocess? Or should I \n> > upgrade...\n> \n> Trying really trivial in-index merge...\n> fatal: Merge requires file-level merging\n> Nope.\n> Traceback (most recent call last):\n> File \"/home/raa/bin/git-merge-recursive\", line 8, in ?\n> from gitMergeCommon import *\n> File \"/home/raa/share/git-core/python/gitMergeCommon.py\", line 14, in ?\n> import subprocess\n> ImportError: No module named subprocess\n> Automatic merge failed/prevented; fix up by hand\n\nHad the same problem earlier today, building with\nWITH_OWN_SUBPROCESS_PY fixed things up...\n\n--\nav\n"},{"id":"11621","messageId":"7viruzm1e8.fsf@assigned-by-dhcp.cox.net","threadId":"2453","inReplyTo":"20051111185246.GB13524@steel.home","subject":"Re: merge-recursive: include heapq?","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-11T19:26:39Z","receivedAt":"2005-11-11T19:26:39Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Riesen writes:\n\n> Johannes Schindelin, Fri, Nov 11, 2005 15:23:04 +0100:\n>> I get this when pulling:\n>>... \n>> Okay, my python is *old*:\n>> \n>> $ python -V\n>> Python 2.2.1\n>> \n>> Is it worthwhile to include heapq as we did with subprocess? Or should I \n>> upgrade...\n>\n> Trying really trivial in-index merge...\n> fatal: Merge requires file-level merging\n> Nope.\n> Traceback (most recent call last):\n> File \"/home/raa/bin/git-merge-recursive\", line 8, in ?\n> from gitMergeCommon import *\n> File \"/home/raa/share/git-core/python/gitMergeCommon.py\", line 14, in ?\n> import subprocess\n> ImportError: No module named subprocess\n> Automatic merge failed/prevented; fix up by hand\n>\n> That said, I thought an upgrade was worth it and upgraded my 2.3 to 2.4 :)\n\nSomething like this is needed, I suppose...\n\n-- >8 -- cut here -- >8 --\nINSTALL: duplicate python requirements from Makefile\n\nand refer the reader to Makefile for other things that can be\ntweaked.\n\nSigned-off-by: Junio C Hamano \n---\ngit diff\ndiff --git a/INSTALL b/INSTALL\nindex 06b11e1..63ccf62 100644\n--- a/INSTALL\n+++ b/INSTALL\n@@ -75,3 +75,15 @@ Issues of note:\n history graphically\n \n \t- \"ssh\" is used to push and pull over the net\n+\n+\t- \"perl\" and POSIX-compliant shells are needed to use most of\n+\t the barebone Porcelainish scripts.\n+\n+\t- \"python\" 2.3 or more recent; if you have 2.3, you may need\n+ to build with \"make WITH_OWN_SUBPROCESS_PY=YesPlease\".\n+\n+ - Some platform specific issues are dealt with Makefile rules,\n+ but depending on your specific installation, you may not\n+ have all the libraries/tools needed, or you may have\n+ necessary libraries at unusual locations. Please look at the\n+ top of the Makefile to see what can be adjusted for your needs.\n\nCompilation finished at Fri Nov 11 11:24:14\n"}]}