PLEASE HELP...Merging files with a changed property

Hi,

I'm rephrasing my problem since I didn't get any answer to my original post.

When I merge two branches which only difference is the value of the
svn:eol-style property for a couple of files, I get a working copy that
I can't commit: Subversion shows the 'U' flag during the merge but a
"svn status" on the working copy returns nothing (no modification) and
"svn propget svn:eol-style" on the specific files returns the old value.

Am I doing something wrong here?

JL

(I use Subversion 1.2)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 16 21:41:17 2005