From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Tue, 30 Aug 2005 07:36:00 GMT
Subject: Re: [PATCH 1/9] Fix git patch header processing in git-apply.
Message-ID: <46a038f905083000362ae0d9fc@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.58.0508291856080.3243@g5.osdl.org>

On 8/30/05, Linus Torvalds <torvalds@osdl.org> wrote:
> Actually, an import should preferably never use patches at all, since that
> never really works for binary data. This is why the CVS importer actually
> checks out full files and imports them that way. The patch-based ones will
> fundamentally always have problems.

<AOL>. Patches can be useful during the process, but you should (a)
prefer more solid manifestations of the file/tree if possible, and (b)
be extremely strict with them. Any hint that they don't match means
that something is borked.

However, if you're importing from patch-oriented SCMs that tend to
'replay' patch sequences from one branch to the other, asking git to
skip applied patches *could* be a shortcut. Not 100% correctness
guarantee, but if the resulting history makes sense, it can be useful.

The other alternative is to do what I'll start to do soon on the
archimport script: keep a tally of what was merged where according to
the records that the source SCM has.

cheers,


martin