Merge property question

Hi - Can anyone tell me how svn:properties work in terms of merging.
The reason I ask is because I had the following scenario which gave
me a big headache.

The scenario went as follows all for the same file...

branch 1 - rev 10 - create new file & commit

branch 2 - rev 11 - merge rev 10 to this branch
branch 2 - rev 12 - add svn:eol-style = revision & svn:needs-lock = true

branch 1 - rev 13 - change a line
branch 1 - rev 14 - add the property svn:eol-style = native
branch 1 - rev 15 - change another line

Now if I tried to merge revs 13 - 15 to branch 2 I got a conflict.
If I perform a merge for each change individually things were OK.

It seemed to be as a result of the property changes but there was no
indication of this in the conflicted file. It just told me that the changes
made in rev 13 & rev 15 were conflicting.

Sorry if this sounds a bit confused but it was really odd & I wondered if
anyone had experienced something similar. I'm sure the conflicts were as a result
of the different property settings.

Is it possible to merge ranges & ignore property changes or not.

Thanks for any help - Simon

**********************************************************************************
This email and any files transmitted with it are confidential, and may be subject to legal privilege, and are intended solely for the use of the individual or entity to whom they are addressed.
If you have received this email in error or think you may have done so, you may not peruse, use, disseminate, distribute or copy this message. Please notify the sender immediately and delete the original e-mail from your system.

Computer viruses can be transmitted by e-mail. Recipients should check this e-mail for the presence of viruses. The Capita Group and its subsidiaries accept no liability for any damage caused by any virus transmitted by this e-mail.
***********************************************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 19 16:23:58 2006