Hi Detlev,
On Wednesday 30 January 2008, Detlev Zundel wrote:
This option you used to make the patches smaller (find-copies or something like this) really makes reviewing not easy. And additionally the patch doesn't apply anymore, since the reference (sequoia) has changed in my non publiched branch already. Another reason why I would like to see a 100k size limit on this list.
So Matthias, could you please resend these 3 patches without this option to me directly?
This failure mode of git is so annoying, effectively rendering the nice patch format useless, that we researched a little bit deeper.
Am I correct to assume that you tried to apply the patch with "plain" git-am only, i.e. without using -3?
IIRC, I didn't even try to apply this version of the patch. I tried to review it and failed because the patch was "unreadable" for me.
Because by now I am pretty much convinced that you should have been able to successfully use it with a "git-am -3" as this invokation really tries to do a merge of the recorded identities of the relevant blobs instead of "only applying diffs".
For the git savvy among the readers on a lower level this uses "--build-fake-ancestor" from git-apply although this option does not lend itself to easy usage from a command line.
I don't remember any problems applying those kind of patches. And I'm pretty sure that I didn't use the "-3" option.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================