[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merging into locally added files

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Wed, 04 Aug 2010 15:52:47 +0100

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
Received on 2010-08-04 17:20:11 CEST

This is an archived mail posted to the Subversion Dev mailing list.