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

Re: Disabling overwriting of existing files in wc on update

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Fri, 31 Aug 2012 22:47:00 +0100

On 30 August 2012 10:38, Alexander Iljin <ajsoft_at_yandex.ru> wrote:
> Hello!
>>> now that we start to really use SVN some colleagues demanded
>>> yesterday that a update should never simply overwrite any already
>>> existing file in the working copy. In such a case it should (as can
>>> be configured for file conflicts already) show this as a conflict
>>> which has to be manually resolved.
>> Canonical answer: Tortoise SVN like any other VCS cannot replace human
>> communication. Make your developers talk to each other. Then you don't
>> have to invent (quirky) solutions for nonexistent problems. An update is
>> supposed to change files, conflicts should be avoided.
> Case: I've got some unversioned files in my WC, which I keep for myself.
> Someone else somewhere added a file with a matching name and committed.
> When I run "Update" - BOOM - my files are gone, replaced with someone
> else's, no questions asked.
> I just tested, and that's exactly how it worked.

I just tested too.

If the files involved are text files then when user 2 updates his file
changes from unversioned status to modified status. If you do a diff
of the file you see the repo version as the base version and your
local version (unchanged) as a modification of that. This is correct

When the files involved are binary then you see the behaviour
Alexander describes. I'm about to report that behaviour on the
subversion mailing list as it looks like data loss to me too.


:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-31 23:47:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.