[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn diff produces a patch which does not reapply cleanly

From: David Ellingsworth <david_at_identd.dyndns.org>
Date: Wed, 7 Jan 2009 11:11:43 -0500

> What *exactly* should we do with these three files to reproduce the error?
> (If you can package the answer in script (or transcript) form, that's
> best.) I tried
> svn add wc1\trunk\test.txt
> svn commit wc1 -m "add"
> rm -f wc1\trunk\test.txt
> cp wc1\trunk\test_v2.txt wc1\trunk\test.txt
> svn diff wc1 > out
> vim -Nu NONE -c "%s/\r//" -c "wq ++ff=dos" out
> svn revert wc1\trunk\test.txt
> patch -d wc1\trunk < out
> diff -u wc1\trunk\test*.txt
> but it didn't cause any error message, and the 'diff -u' at the end also
> found no differences (the expected result). Results are the same with
> both 1.5 and trunk.
> Daniel

The steps to reproduce are as follows:

svn add test.txt
svn commit -m "add"
cp test_v2.txt test.txt
svn diff > patchfile
svn revert test.txt
patch -p0 < patchfile

There's a possibility this could be a platform issue as I am using
Windows XP. TortoiseSVN was used to create the repository, svn client
version 1.5.5 from Colabnet was used to add/commit/diff/revert the
file, and patch version 2.5 distributed with msysgit 1.6.1 preview was
used to patch the file. Please retest this on an Windows box please.


David Ellingsworth
Received on 2009-01-07 18:43:02 CET

This is an archived mail posted to the Subversion Dev mailing list.