Re: complex patch/diff usage

[Ian Stevenson]

That's what I thought would do it. So I did:

diff -u A2 A22 > diff
patch < diff

But it returned the error

patching file A11
Hunk #1 FAILED at 335.
1 out of 1 hunk FAILED -- saving rejects to file A11.rej

(pretty much anyway - as the filenames are different).

> From: prj@po.cwru.edu (Paul Jarc)
> To: ianstevenson@hotmail.com (Ian Stevenson)
> CC: help-gnu-utils@gnu.org
> Subject: Re: complex patch/diff usage
> Date: Thu, 29 Jul 2004 00:46:26 -0400
>
> ianstevenson@hotmail.com (Ian Stevenson) wrote:
> >    A
> >   / \
> > A1   A2
> >  |   | x
> > A11  A22
> >
> > The x marks the changes that we want to go into A11.
>
> Create a diff between A2 and A22.  Then apply that patch to A11.
>
> > To further help you understand this, think of CVS branches - as that's
> > how this came about.
>
> Other version control systems (say, Arch) would make it easier to
> handle this situation.
>
>
> paul

_________________________________________________________________
Feeling spent? Apply here for emergency plastic surgery:   
http://ad.doubleclick.net/clk;9577691;9687279;r?http://www.promo.com.au/virgincreditcard/plasticsurgery/track.cfm?source=P08