Johan Corveleyn wrote:
> Julian Foad wrote:
>> 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?
No hard-and-fast reason. A minor practical reason: it's helpful to leave some
SVN_DBG calls in that code for the time being, and those don't compile in
release mode (that's intentional); but we could easily overcome that if we
wanted ("#ifdef SYMMETRIC #define SVN_DBG", for example).
- Julian
