On Wed, Aug 4, 2010 at 10:52 AM, Julian Foad <julian.f...@wandisco.com> wrote: > 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
Stefan, This change in behavior seems sound to me and I don't see it causing any problems in the merge-tracking realm. > 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.) I don't follow you there, how would a merge to a file ever be a tree conflict? Or do you mean if our merge target is an added directory? Stefan's patch supports that as well. > Please do split up the patch! Agreed. Paul > - Julian > > >
