We currently use svnmerge to manage merging. The environment is a mix of v1.4 and v1.5 clients, and the svn server was recently updated to v1.5.
After evaluating svn 1.5's merge features, it was decided that we'll stick with svnmerge to manage merges until the rename & reflective merge issues are sorted out (hopefully in svn 1.6).
My question is, are there any known issues with using svnmerge to manage merges in the environment I described above. I've been searching online for this information without much success.
Since the server is 1.5, commits made using client 1.5 will add the mergeinfo svn property. This could potentially trip svnmerge since it doesn't know anything about the mergeinfo property.
I have seen suggestions that advocate the use of '--ignore-ancestry' switch to prevent 1.5 client from adding the mergeinfo property on commit. But this switch has been available in svn prior to v1.5. I am not sure of the impact on merge operations if we modify svnmerge.py to use that switch. Also, there is a post on the svn mailing list saying that '--ignore-ancestry' continues to modify the mergeinfo property. There has been no reply to that post yet: http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=987317
Appreciate any information on this matter.
--Dileepa