Hi Stefan,
> Hi Matthias,
>
> On Friday 28 December 2007, Matthias Fuchs wrote:
>> This patch adds the first files for the new esd PMC440 boards.
>> The next two patches will complete the PMC440 board support.
>>
>> Signed-off-by: Matthias Fuchs <[EMAIL PROTECTED]>
>> ---
>> board/{amcc/sequoia => esd/pmc440}/Makefile | 4 +-
>> board/{amcc/sequoia => esd/pmc440}/config.mk | 0
>> board/{amcc/sequoia => esd/pmc440}/init.S | 64 +--
>> .../sequoia/sequoia.c => esd/pmc440/pmc440.c} | 564
>> +++++++++++++++----- board/esd/pmc440/pmc440.h |
>> 154 ++++++
>> board/{amcc/sequoia => esd/pmc440}/sdram.c | 0
>> board/{amcc/sequoia => esd/pmc440}/sdram.h | 0
>> board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds | 0
>> board/{amcc/sequoia => esd/pmc440}/u-boot.lds | 0
>> 9 files changed, 595 insertions(+), 191 deletions(-)
>> copy board/{amcc/sequoia => esd/pmc440}/Makefile (95%)
>> copy board/{amcc/sequoia => esd/pmc440}/config.mk (100%)
>> copy board/{amcc/sequoia => esd/pmc440}/init.S (71%)
>> copy board/{amcc/sequoia/sequoia.c => esd/pmc440/pmc440.c} (57%)
>> create mode 100644 board/esd/pmc440/pmc440.h
>> copy board/{amcc/sequoia => esd/pmc440}/sdram.c (100%)
>> copy board/{amcc/sequoia => esd/pmc440}/sdram.h (100%)
>> copy board/{amcc/sequoia => esd/pmc440}/u-boot-nand.lds (100%)
>> copy board/{amcc/sequoia => esd/pmc440}/u-boot.lds (100%)
>
> 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?
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.
Cheers
Detlev
--
It was actually a very beautiful thing to see a sunrise, cause' that's
such a calm time of day. It's a wonderful time of day to get ready to
go to bed.
-- Richard M. Stallman
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED]
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
U-Boot-Users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/u-boot-users