(woops, sent just to Junio, resending to list)
Hi,
Thanks for the suggestions, I've tried both those commands, and they
break too :-(
2010/1/7 Junio C Hamano <gitster@xxxxxxxxx>:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>> What "cherry-pick" internally does is to run:
>>
>> git merge-recursive 301a^ -- HEAD 301a
>>
>> That is, "We are at HEAD; consolidate the change since 301a^ to 301a into
>> our state, and leave the result in the index and the work tree". Then it
>> commits the result. One thing to try is to see if this gives the same
>> kind of breakage.
$ git merge-recursive 301a^ -- HEAD 301a
# woo! no response! promising
$ git status
# On branch cgi_branch
<snip>
# new file: bin/upload_module.pl
#
# Unmerged paths:
# added by us: www/client/css/admin-clean.css
# added by us: www/client/css/admin.css
<snip dozens of spurious "added by us">
> There actually is another possibility; we used to run inside "cherry-pick"
>
> git merge-resolve 301a^ -- HEAD 301a
>
> instead. The request is the same but it uses a different algorithm, so if
> one fails and one succeeds, that might give us a better clue to figure out
> what is going on.
$ git merge-resolve 301a^ -- HEAD 301a
Trying simple merge.
Simple merge failed, trying Automatic merge.
error: www/client: is a directory - add individual files instead
fatal: Unable to process path www/client
error: www/css: is a directory - add individual files instead
fatal: Unable to process path www/css
error: www/images: is a directory - add individual files instead
fatal: Unable to process path www/images
error: www/js: is a directory - add individual files instead
fatal: Unable to process path www/js
fatal: merge program failed
At least the latter fails more informatively?
Thanks again for the help and suggestions ;-)
osfameron
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html