Piet-Hein Peeters wrote: > Hello, > > I've tested the patch with the handling of transititive mergering > property conflicts. > The conflicts are 'resolved' correctly and the properties have the > correct value after the merge. However, the dir_conflicts.prej file is > not deleted which causes that svn status still detects a merge conflict > and the commit is blocked.
With the trunk version (which has the patch integrated) there should not be any directory property conflicts at all, and therefore no dir_conflicts file... can you post a short reproduction recipe for it? Thanks, Raman Gupta _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
