Branko Čibej <brane_at_wandisco.com> writes:
> On 19.01.2014 09:06, Yuri wrote:
>> (Previously I thought that I just did something wrong, or maybe
>> unconsciously hit 'resolved' option without remembering)
>> I am pretty sure that 'svn update' marks certain files as 'deleted'
>> without user ever doing 'svn delete' or resolving any conflict on them.
>> Somebody needs to take a close look how is this is possible.
> For starters, somebody can take the time to confirm that stock
> Subversion without FreeBSD-specific patches behaves the same way. Sorry
> if that sounds a bit untrustful, but frankly, I can't recall seeing the
> problem you report in any release version of Subversion, so I have my
If there is such a problem it should be much easier for you to reproduce
it than for us to work out exactly what you are doing. For example
update itself can resolve conflicts with --accept:
svnadmin create repo
svn mkdir -mm file://`pwd`/repo/A
svn import -mm repo/format file://`pwd`/repo/A/f
svn co file://`pwd`/repo_at_1 wc
svn up --accept working wc
That leads to f being marked for deletion:
$ svn st wc
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2014-01-20 10:55:57 CET