Julian Foad wrote: > I'll try doing a catch-up merge from trunk as well, now.
I did a catch-up as far as trunk@1664077 (which is a few weeks ago), resolving the few minor conflicts. One of the changes this merge brought in from trunk was a re-working of the part of autogen.sh that you fixed in your patch. The next commit on trunk, r1664078, changed the repos 'open' method signature. I'll leave that for you or someone else to resolve. [[[ r1664078 | rhuijben | 2015-03-04 17:23:46 +0000 (Wed, 04 Mar 2015) | 74 lines Following up on r1609499, which made all ra layers change the auth baton in a way that affects all ra session using it, make it possible to create a slave auth baton that shares everything with the parent baton except for the parameters. Each ra session gets its own slave parameters, and thereby allows applying their own settings from the server group (and other origins), without affecting other ra sessions. [...] * subversion/libsvn_ra/ra_loader.h (svn_ra__vtable_t.open_session): Add auth_baton argument and split pools. [...] ]]] - Julian