[haiku-development] Re: Patch format?

  • From: pete.goodeve@xxxxxxxxxxxx
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Wed, 31 Mar 2010 15:08:25 -0700

Thanks Urias and Ingo -- I will follow your advice...

On Wed, Mar 31, 2010 at 11:12:31PM +0200, Ingo Weinhold wrote:
> You don't have to edit the patch.
OK, thanks.  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(?).

> Generally patches created from within the checked out trunk directory are 
> preferred. Additional directory levels aren't a problem either, as they can 
> easily be stripped with patch's '-p' option. Patches from inner directories 
> are bothersome, though.

OK --  I'll avoid that option.  (My tree is actually rooted in 'haiku'
rather than 'trunk' -- because that's the way berlios provided it --,
but below that it's identical, so I should be able to diff from the
haiku directory and get the same result.)

                -- Pete --

Other related posts: