In r1418585 I committed a much better version of this, and a test which passes.
It's still not right -- it's putting the props into the DB immediately, whereas it should be adding another work item to the work queue instead -- but it's a start. - Julian >> Julian Foad wrote: >>> I'm just posting this so you (Philip et el.) can take a look if you >>> want to. I might proceed by extending the tests to check props and >>> then committing it if it works, but really I want to factor it better >>> -- maybe by reusing svn_wc_merge5() or the guts thereof, sooner or > later.