On Tue, Apr 10, 2012 at 4:04 PM, Julian Foad <julianf...@btopenworld.com> wrote: > Johan Corveleyn wrote: > >> Ah, when I use --disable-shared, it works (both release and debug >> builds). So the problem only happens with a shared release build on >> Windows. Not sure why. > > If I can help by changing the conditional compilation of the symmetric merge > code, I'm happy to do so, just let me know.
For now, it's ok, I'm using a Debug build for the time being, assuming that this problem will go away eventually, if the symmetric merge becomes standard. I'm wondering though why SVN_WITH_SYMMETRIC_MERGE is defined only when SVN_DEBUG is defined. This is trunk anyway, so it won't be released as is. Why make the symmetric merge code conditional on whether or not it's a debug build? -- Johan
