> -----Original Message-----
> From: Mikhail Sobolev [mailto:mss@mawhrin.net]
> Sent: Monday, December 13, 2004 10:32 AM
> To: users@subversion.tigris.org
> Subject: Re: 'svn diff' crates patch that cannot be applied back
>
>
> On Sun, Dec 12, 2004 at 05:58:14PM +0100, ?URDINA Michal wrote:
> > it is odd that when I used svn diff, it created patch file,
> that could not be completely applied. All I did was:
> >
> > 1. svn checkout
> > 2. modify file
> > 3. svn diff file > patch.diff
> > 4. svn revert file
> > 5. patch -u -i patch.diff file
> >
> > Result:
> > patching file `file'
> > Hunk #2 FAILED at 25.
> > 1 out of 3 hunks FAILED -- saving rejects to file.rej
> >
> > I tested this on many files and more than one file but not
> all had this problem.
> >
> > How is this possible? Can you please tell me what am I doing wrong?
> > Plain unix diff works correctly.
> Is it possible that you are using some keywords in the files that
> failed?
>
Only keyword used is $Id.
I think that using keywords should not make difference and created patch
should be always applicable back to original file.
I suspect that the problem is somewhere in incompatibility of diff lib
used in svn and used version of 'patch'.
Michal
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 13 13:30:54 2004