The suffering... propset, svn:ignore, & \r\n

I imported a bunch of files, checked it back out, set a bunch of
svn:ignore properties, played around with db_checkpoint, and left. Came
back later, tried to do an 'svn up', and got back an evil error message:

D:\Code\Black\ninetjer>svn up
? .\www\index.html

apr_error: #20014, src_err 0 : <Error string not specified yet>
  The REPORT status was 500, but expected 200.

OK... I've seen that error before, that's the one that means "something
bad happened, check the server's error_log... that's where we stashed
the real error". Server says:

[Fri Dec 07 01:11:17 2001] [error] [client 24.38.55.127] A failure
occurred while recording one of the items of working copy state. [500,
#21050]
[Fri Dec 07 01:11:17 2001] [error] [client 24.38.55.127] file not found:
filesystem `/cvs/svn/ninetjer/db', revision `1', path
`/trunk/build\release' [500, #21050]

Checking out http://svn.ninetjer.org/repos/ninetjer/trunk/build/release
works, so I try directly updating it:

D:\Code\Black\ninetjer>svn up build/release
_C build\release\win32-vc7
_C build\release\win32-vc6

Hmmm... a conflict? With who?!? Me in the future? :-P

D:\Code\Black\ninetjer\build\release>svn up
? .\win32-vc7\dir_conflicts.62236.00001.prej
? .\win32-vc6\dir_conflicts.62236.00001.prej

OK, fails to note what the conflict files are, that could get annoying
(wonder if I should add *.prej to my svn:ignore...).

Regardless, the contents shows:

prop `svn:ignore': user set to '...1...', but update set to '...2...'.

Where ...1... is my svn:ignore with \r\n (which is how I inputted it, as
a windows text file edited with notepad), and ...2... is apparently the
version with only \n... the server converted it for me, but the client
didn't know it would do that and choked while trying to merge the
change.

Need a FAQ entry that explains that properties can't include \r\n? :-P

*trashes his working copy and spends another 20 minutes checking it out
again, hehe... easier than figuring out how to fix conflicts using svn*

Sincerely,
Jay Freeman (saurik)
saurik@saurik.com

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:51 2006