> I'm hoping that 1.7 will address much of this... Hmmm, just to manage some expectations: I wouldn't expect too much tree-conflict or merge improvements in 1.7. There might be some small improvements here and there, but the big ones will not be in 1.7.
That's very sad. I love SVN, but I'm not sure my patience will last for another year... :(