Merging files which a changed property

Hi,

I have two working copies on my drive: trunk (in folder trunk) and
branches/branch1 (in folder branch1).

Right now, the only difference between trunk and branch1 is the
svn:eol-style property for a couple of files.

When I do: svn merge trunk@HEAD branch1@HEAD branch1
I see:
  U branch1/path/to/file
for all the modified files.

Unfortunately, a "svn status branch1" returns nothing (no modification)
and "svn propget svn:eol-style branch1/path/to/file" 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 17:27:43 2005