Stefan Sperling wrote: > It does not seem possible right now to merge into locally added > files, because the Subversion assumes that the merge target will > always have a corresponding URL in the repository, and errors out. > > With a bit of special-casing during error handling in a few places, > I succeeded in making this use case work: [...]
Hi Stefan. In my opinion, Subversion should allow such a merge to be attempted, and the result should be a textual merge like you've done here if the tree conflict detection policy is "relaxed", and should be a tree conflict if the policy is "strict". (Yes, the "tree conflict detection policy" switch only exists in my head.) Please do split up the patch! - Julian
