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

Re: Letters at beginnings of columns of svn output

From: JamieEchlin <jamie.echlin_at_credit-suisse.com>
Date: Thu, 20 Jan 2011 09:22:43 -0800 (PST)

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.

-- 
View this message in context: http://old.nabble.com/Letters-at-beginnings-of-columns-of-svn-output-tp30714345p30721385.html
Sent from the Subversion Users mailing list archive at Nabble.com.
Received on 2011-01-20 18:23:22 CET

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