Luben Tuikov [off-list ref] writes:
Ok, if your patch below resolves the bug (please see my
other email just posted) please submit it. (I'm hitting
this bug everytime there's a file deleted from the
kernel tree and I try to merge.)
Sorry to hear that. The patch I sent you is already pushed out
and mirrored the public machines.
The failure from '-s recursive' (lack of heapq) makes me suspect
that your Python installation is too old. The 'resolve' method
you've been using should work fine for this case; otherwise
replace '-s recursive' in the message from Linus with '-s
resolve' for the 'git merge' commandline, like this:
$ git merge -s resolve "merge linus' tree" HEAD master
--- Junio C Hamano <junkio@cox.net> wrote:
Luben Tuikov [off-list ref] writes:
quoted
Ok, if your patch below resolves the bug (please see my
other email just posted) please submit it. (I'm hitting
this bug everytime there's a file deleted from the
kernel tree and I try to merge.)
Sorry to hear that. The patch I sent you is already pushed out
and mirrored the public machines.
Yes, I pulled right after I posted and saw you pushed it.
The failure from '-s recursive' (lack of heapq) makes me suspect
that your Python installation is too old. The 'resolve' method
you've been using should work fine for this case;
$python -V
Python 2.4.2
$which python
/usr/local/bin/python
otherwise
replace '-s recursive' in the message from Linus with '-s
resolve' for the 'git merge' commandline, like this:
$ git merge -s resolve "merge linus' tree" HEAD master
Ok, I'll try this next time I hit this problem.
Thanks,
Luben