Re: Merge-tracking bug

On Fri, Apr 18, 2008 at 2:58 PM, Eric Gillespie <epg_at_pretzelnet.org> wrote:
> If you do a merge that should Add a file, but you already have
> this file unversioned in your working copy (say, because you've
> just switched a copy from trunk (which has the file) to your
> branch), svn merge Skips it. The Skip notice is lost in the
> noise, but worse, the mergeinfo claims the file is there. So,
> even after you remove the unversioned file (which you shouldn't
> have to do anyway), svn merge still won't pick it up.

Hmmm. It is not obvious to me what we should do here. Maybe abort?

I believe the skipped behavior has always been there, and we cannot
set any mergeinfo because to do that we need to have the file.

We might ultimately need the tree-conflicts code before this can be dealt with.

Did you have any ideas?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org