Re: Merge - unexpected notifications

On Fri, Jul 18, 2008 at 6:30 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> Using svn 1.5.0 to merge branches/1.5.x-issue3067 into a clean WC of
> branches/1.5.x, I am seeing strange notifications.
>
> 1. "Skipped missing target: 'subversion/libsvn_auth_kwallet'" messages
> for many such targets that don't exist in either of these branches.
>
> 2. "A" ("Add") notifications for files that are already present and are
> not being added by the merge.
>
> 3. "Conflict for property 'svn:ignore' discovered on
> 'subversion/tests/libsvn_subr'" but when I choose (e) to edit the file,
> I get a file containing some 'svn:ignore' value but without any conflict
> markers in it. (I wouldn't be surprised if that's a known deficiency,
> but I wasn't aware of it and it's not clear how I'm supposed to be able
> to resolve the conflict in the editor.)

I used trunk to do the merge because I also saw all of this. Trunk
worked fine. So I am hoping that branch you are merging fixes this
issue,

-- 
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