On 10/13/2009 12:09 PM, Dave Korn wrote:
Alas that doesn't prevent the conflicts, it just makes them "was removed on trunk" rather than "was changed on trunk"! Well, that's what happened to me anyway. It's a shame that svn doesn't have separate --accept types for files and for properties, that would have helped.
Yeah, well, at least with it removed from trunk we shouldn't have the same problem next time.
r~
