[haiku-development] Re: Patch format?

  • From: pete.goodeve@xxxxxxxxxxxx
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Thu, 1 Apr 2010 11:36:55 -0700

On Thu, Apr 01, 2010 at 11:31:58AM +0200, Ingo Weinhold wrote:
> On 2010-04-01 at 00:08:25 [+0200], pete.goodeve@xxxxxxxxxxxx wrote:
> >   I understand from the man page that patch takes as possibles
> > *all* the files that are listed, so that as long as one of them matches
> > the target (beginning with 'src/...') it should find it.  So if the old
> > file is in "src/.../servers/ALPHA1/...", and the revised one has the
> > expected path of "src/.../servers/...", that should be fine(?).
> 
> Don't know about that. The usual approach when creating diffs against a 
> source archive is to unzip it twice, edit one tree, and create a diff 
> between the trees.
> 
I think that's essentially what I've done in the end.  The source I work on
-- originally from berlios, but updated with changesets as necessary --
is in '<BASE_WORK_DIR>/haiku/src/...' and the reference sources -- from
the changesets -- are in '<BASE_WORK_DIR>/haiku/trunk/src/...'.
(I don't have the whole tree in the latter, though, just the relevant
pieces I've downloaded.)  I do the diff on the directories or files
in those two trees, from '<BASE_WORK_DIR>/haiku/' so the "new" file
has the expected path (beginning with 'src/...').

Anyway, I uploaded the patch yesterday (ticket #5664) so please
somebody tell me if it doesn't work...

Thanks,
                -- Pete --


Other related posts: