{"thread":{"id":"2619","subject":"non-trivial merge failures","startedAt":"2005-11-20T21:49:45Z","lastAt":"2005-11-21T08:26:17Z","messageCount":9,"participants":["David S. Miller","Ismail Donmez","Ryan Anderson","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"12394","messageId":"20051120.134945.104623647.davem@davemloft.net","threadId":"2619","inReplyTo":null,"subject":"non-trivial merge failures","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-11-20T21:49:45Z","receivedAt":"2005-11-20T21:49:45Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"\nEvery time I try to do a non-trivial merge, I always\nget this:\n\ndavem@sunset:~/src/GIT/net-2.6$ git pull git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/\nUnpacking 21 objects\n 100% (21/21) done\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\nTraceback (most recent call last):\n File \"/home/davem/bin/git-merge-recursive\", line 13, in ?\n from gitMergeCommon import *\n File \"/home/davem/share/git-core/python/gitMergeCommon.py\", line 18, in ?\n import subprocess\nImportError: No module named subprocess\nAutomatic merge failed/prevented; fix up by hand\ndavem@sunset:~/src/GIT/net-2.6$ \n\n(one can reproduce this exact tree state by cloning:\n\tmaster.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git\n then executing the above pull command)\n\nMaybe something is wrong with my python installation or\nsomething like that?\n\nIt looks like it's failing to import some python module called\n\"subprocess\", and I aparently don't have that installed.\n/usr/bin/python on this Debian box is aparently python-2.3, do\nI need to be using python-2.4 for this merge stuff to work?\n"},{"id":"12395","messageId":"200511202351.42320.ismail@uludag.org.tr","threadId":"2619","inReplyTo":"20051120.134945.104623647.davem@davemloft.net","subject":"Re: non-trivial merge failures","fromName":"Ismail Donmez","fromEmail":"ismail@uludag.org.tr","sentAt":"2005-11-20T21:51:42Z","receivedAt":"2005-11-20T21:51:42Z","isPatch":false,"sender":{"key":"ismail@uludag.org.tr","avatar":null},"body":"Sunday 20 November 2005 23:49 tarihinde şunları yazmıştınız:\n> ImportError: No module named subprocess\n\nYou need Python 2.4.x, subprocess is a new module in Python 2.4\n\nRegards,\nismail\n"},{"id":"12398","messageId":"20051120230738.GA16861@mythryan2.michonline.com","threadId":"2619","inReplyTo":"20051120.134945.104623647.davem@davemloft.net","subject":"Re: non-trivial merge failures","fromName":"Ryan Anderson","fromEmail":"ryan@michonline.com","sentAt":"2005-11-20T23:07:38Z","receivedAt":"2005-11-20T23:07:38Z","isPatch":false,"sender":{"key":"ryan@michonline.com","avatar":null},"body":"On Sun, Nov 20, 2005 at 01:49:45PM -0800, David S. Miller wrote:\n> \n> Every time I try to do a non-trivial merge, I always\n> get this:\n\ngit-merge-recursive became the default merge tool recently, and Debian\nuses Python 2.3 as the default, which lacks \"subprocess.py\". Luckily,\ngit ships a backport, so you can do:\n\n\tmake WITH_OWN_SUBPROCESS_PY=YesPlease all doc test install install-doc\nor\n\tmake PYTHON_PATH=/usr/bin/python2.4 all doc test install install-doc\n\nand fix things up (the second assuming, of course, you have python-2.4\ninstalled)\n\nAlternatively, you can build your own Debian packages with \"make deb\"\nand just install them.\n\n\n-- \n\nRyan Anderson\n sometimes Pug Majere\n"},{"id":"12401","messageId":"Pine.LNX.4.63.0511210037320.24681@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2619","inReplyTo":"200511202351.42320.ismail@uludag.org.tr","subject":"Re: non-trivial merge failures","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-20T23:39:01Z","receivedAt":"2005-11-20T23:39:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 20 Nov 2005, Ismail Donmez wrote:\n\n> Sunday 20 November 2005 23:49 tarihinde ÿÿunlarÿÿ yazmÿÿÿÿtÿÿnÿÿz:\n> > ImportError: No module named subprocess\n> \n> You need Python 2.4.x, subprocess is a new module in Python 2.4\n\nNo, you don't need 2.4, but at least 2.3. If you don't install git, but \nrun it from where you compile it, be sure to set GIT_PYTHON_PATH in your \nconfig.mak. In any case, you need to set WITH_OWN_SUBPROCESS_PY for 2.3\n\nHth,\nDscho\n"},{"id":"12409","messageId":"20051120.201516.51180644.davem@davemloft.net","threadId":"2619","inReplyTo":"200511202351.42320.ismail@uludag.org.tr","subject":"Re: non-trivial merge failures","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-11-21T04:15:16Z","receivedAt":"2005-11-21T04:15:16Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Ismail Donmez \nDate: Sun, 20 Nov 2005 23:51:42 +0200\n\n> Sunday 20 November 2005 23:49 tarihinde �unlar� yazm� t�n�z:\n> > ImportError: No module named subprocess\n> \n> You need Python 2.4.x, subprocess is a new module in Python 2.4\n\nIt's amazing that \"make test\" passes in the presence of Python 2.3 :-)\n\nMaybe at least a trivial version check can be added to GIT somewhere?\n"},{"id":"12410","messageId":"20051120.201712.32582587.davem@davemloft.net","threadId":"2619","inReplyTo":"20051120221922.GB29291@mail.com","subject":"Re: non-trivial merge failures","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-11-21T04:17:12Z","receivedAt":"2005-11-21T04:17:12Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Ray Lehtiniemi \nDate: Sun, 20 Nov 2005 15:19:22 -0700\n\n> On Sun, Nov 20, 2005 at 01:49:45PM -0800, David S. Miller wrote:\n> > \n> > It looks like it's failing to import some python module called\n> > \"subprocess\", and I aparently don't have that installed.\n> > /usr/bin/python on this Debian box is aparently python-2.3, do\n> > I need to be using python-2.4 for this merge stuff to work?\n> \n> Define WITH_OWN_SUBPROCESS_PY in Makefile to install a copy of\n> this module.\n\nHow about a version check at build or \"make test\" time so we can get a\nsensible failure diagnostic instead of a weird cryptic \"subprocess\nimport failure\" when Python is too old? :-)\n\nAt least some better behavior than what we have now, where \"make test\"\nstill passes when you have this problem.\n"},{"id":"12411","messageId":"20051120.202032.37639519.davem@davemloft.net","threadId":"2619","inReplyTo":"20051120230738.GA16861@mythryan2.michonline.com","subject":"Re: non-trivial merge failures","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-11-21T04:20:32Z","receivedAt":"2005-11-21T04:20:32Z","isPatch":false,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Ryan Anderson \nDate: Sun, 20 Nov 2005 18:07:38 -0500\n\n> On Sun, Nov 20, 2005 at 01:49:45PM -0800, David S. Miller wrote:\n> > \n> > Every time I try to do a non-trivial merge, I always\n> > get this:\n> \n> git-merge-recursive became the default merge tool recently, and Debian\n> uses Python 2.3 as the default, which lacks \"subprocess.py\". Luckily,\n> git ships a backport, so you can do:\n> \n> \tmake WITH_OWN_SUBPROCESS_PY=YesPlease all doc test install install-doc\n> or\n> \tmake PYTHON_PATH=/usr/bin/python2.4 all doc test install install-doc\n\nAll these ways to make it work are nice, and in fact I have\nno problem with upgrading to python2.4 on my system if that\nmakes it work.\n\nI have a huge problem with the fact that \"make test\" passes %100\ncleanly even if you have the wrong python version installed. It's\namazing that this is that possible if even the most non-trivial merge\nneeds this Python code :-)\n"},{"id":"12414","messageId":"20051120.213129.88244378.davem@davemloft.net","threadId":"2619","inReplyTo":"11325498823557-git-send-email-ryan@michonline.com","subject":"Re: [PATCH] Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY","fromName":"David S. Miller","fromEmail":"davem@davemloft.net","sentAt":"2005-11-21T05:31:29Z","receivedAt":"2005-11-21T05:31:29Z","isPatch":true,"sender":{"key":"davem@davemloft.net","avatar":null},"body":"From: Ryan Anderson \nDate: Mon, 21 Nov 2005 00:11:22 -0500\n\n> Also rearrange some path settings in the Makefile in the process.\n> \n> Signed-off-by: Ryan Anderson \n\nLooks good from here.\n"},{"id":"12419","messageId":"Pine.LNX.4.63.0511210925570.27634@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2619","inReplyTo":"20051120.213129.88244378.davem@davemloft.net","subject":"Re: [PATCH] Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-21T08:26:17Z","receivedAt":"2005-11-21T08:26:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 20 Nov 2005, David S. Miller wrote:\n\n> From: Ryan Anderson \n> Date: Mon, 21 Nov 2005 00:11:22 -0500\n> \n> > Also rearrange some path settings in the Makefile in the process.\n> > \n> > Signed-off-by: Ryan Anderson \n> \n> Looks good from here.\n\nNot from here... I don't have it ;-) Care to share?\n\nCiao,\nDscho\n"}]}