From: "David S. Miller" <davem@davemloft.net>
To: git@vger.kernel.org
Subject: non-trivial merge failures
Date: Sun, 20 Nov 2005 13:49:45 -0800 (PST) [thread overview]
Message-ID: <20051120.134945.104623647.davem@davemloft.net> (raw)
Every time I try to do a non-trivial merge, I always
get this:
davem@sunset:~/src/GIT/net-2.6$ git pull git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
Unpacking 21 objects
100% (21/21) done
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Traceback (most recent call last):
File "/home/davem/bin/git-merge-recursive", line 13, in ?
from gitMergeCommon import *
File "/home/davem/share/git-core/python/gitMergeCommon.py", line 18, in ?
import subprocess
ImportError: No module named subprocess
Automatic merge failed/prevented; fix up by hand
davem@sunset:~/src/GIT/net-2.6$
(one can reproduce this exact tree state by cloning:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
then executing the above pull command)
Maybe something is wrong with my python installation or
something like that?
It looks like it's failing to import some python module called
"subprocess", and I aparently don't have that installed.
/usr/bin/python on this Debian box is aparently python-2.3, do
I need to be using python-2.4 for this merge stuff to work?
next reply other threads:[~2005-11-20 21:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-20 21:49 David S. Miller [this message]
2005-11-20 21:51 ` non-trivial merge failures Ismail Donmez
2005-11-20 23:39 ` Johannes Schindelin
2005-11-21 4:15 ` David S. Miller
2005-11-20 23:07 ` Ryan Anderson
2005-11-21 4:20 ` David S. Miller
[not found] ` <11325498823557-git-send-email-ryan@michonline.com>
2005-11-21 5:31 ` [PATCH] Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY David S. Miller
2005-11-21 8:26 ` Johannes Schindelin
[not found] ` <20051120221922.GB29291@mail.com>
2005-11-21 4:17 ` non-trivial merge failures David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051120.134945.104623647.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox