All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot-Users] [PATCH 1/3 RESEND] ppc4xx: Add initial esd PMC440 board files
Date: Wed, 30 Jan 2008 14:25:31 +0100	[thread overview]
Message-ID: <200801301425.31856.sr@denx.de> (raw)
In-Reply-To: <m2lk6778oj.fsf@ohwell.denx.de>

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 at denx.de
=====================================================================

  reply	other threads:[~2008-01-30 13:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-28 10:56 [U-Boot-Users] [PATCH 1/3 RESEND] ppc4xx: Add initial esd PMC440 board files Matthias Fuchs
2007-12-28 12:11 ` Stefan Roese
2007-12-28 12:33   ` Matthias Fuchs
2008-01-30 13:19   ` Detlev Zundel
2008-01-30 13:25     ` Stefan Roese [this message]
2008-01-30 14:34       ` Detlev Zundel
2008-01-30 14:39         ` Stefan Roese
2008-01-30 23:52         ` Wolfgang Denk
2008-01-30 22:50     ` Jon Loeliger
2008-01-31 13:26       ` Detlev Zundel

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=200801301425.31856.sr@denx.de \
    --to=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.