issue with merges in 1.5 with props, script attached.

Hey guys,

When using merging with properties I get conflicts
even when the merge should succeed without issue.

It's easy enough to reproduce with the script attached.

Note: please change:
 SVNROOT="svn+ssh://spigot/svn"
 TESTPROJ="scratch"
in the script to point at your repo.

What I would like is:
1) non-meta-data should just merge without issue
2) option to specify to always "take" a property from
   either the TO or FROM branch as a seperate option.

thanks!

-- 
- Alfred Perlstein

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org