Okay - I read through and understand the use of reintegrate - but that is what we are using and the script provided in the original post uses. The issue is that even with its use, I'm getting a tree conflict. Please read and test the script from the original post.
On Feb 24, 2013, at 7:59 AM, Stefan Sperling <s...@elego.de> wrote: > On Sun, Feb 24, 2013 at 07:55:41AM -0500, James Hanley wrote: >> Is this a use case that was taken into consideration, and will it be >> "fixed" or the functionality/logic added to allow this use case? > > See my other reply for more details, but yes, this is being addressed: > http://subversion.apache.org/docs/release-notes/1.8.html#auto-merge
