[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: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 23 Aug 2010 18:35:42 +0200

On Wed, Aug 04, 2010 at 11:23:00AM -0400, Paul Burba wrote:
> On Wed, Aug 4, 2010 at 10:52 AM, Julian Foad <julian.foad_at_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.

I've committed this change, and two regression tests, in r988188.
Stephen Butler help me figure out some related issues in our test suite,
which we fixed in r988144 and r988175.

Note that while my original post was only about merging into locally added
files, I discovered that merging into locally added directories also works.

One more question: In case a file/directory has been copied, does that
affect its implicit mergeinfo in any way? If so, we should probably make
the code I added to get_full_mergeinfo() handle copies differently
than locally added items.

Stefan
Received on 2010-08-23 18:36:40 CEST

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