On Thu, Jan 20, 2011 at 09:22:43AM -0800, JamieEchlin wrote:
>
>
>
> Stefan Sperling-7 wrote:
> >
> >
> > This cannot happen during merge though, so the help text for merge
> > shouldn't be listing it.
> >
>
> It happens all the time?! You merge changelists that contain added files,
> however the file can't be added because an unversioned file with the same
> path already exists in the wc. Svn client says "skipped foo.c".
>
> It would be nice if svn status marked that, perhaps with Existed.
>
> It's easy to do too... merge, revert -R, then merge again. ie what I was
> banging about in paras 6 onwards here:
> http://svn.haxx.se/users/archive-2011-01/0104.shtml.
Sorry, I could have been clearer.
What I meant to say was that the E notification cannot happen during merge,
because the merge code doesn't use this notification type.
Stefan
Received on 2011-01-20 20:44:46 CET