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

1.7.9 added file does not give tree conflict when updating another wc?

From: Aric Czarnowski <aczarnowski_at_unimax.com>
Date: Tue, 7 May 2013 10:04:49 -0700 (PDT)

There is a difference between TortoiseSVN 1.7.9 and a SVN 1.7.9 command line client during update. I found http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3002111 which indicates it is expected behavior, but a mismatch seems odd so I'd like to confirm.

We have a code generation tool which generates stub code files if they are missing. When overrides are needed the developer adds the file to SVN, enhances the code, and commits. Now the file exists from the repository and will not be overwritten by the code generator.

But when other developers update they need to get the repository's version. The auto generated stub sitting on their machine is unversioned and sparse.

When we update a working copy with the unversioned stub file using a command line client we get a tree conflict. Now we know, and can ensure the repository version is retained.

When we update a working copy with the unversioned stub file using TortoiseSVN we get a "Versioned" value in the Action column, the file is marked modified, but the wc's sparse contents remain. No conflict is set.

We prefer the command line client behavior of a tree conflict. Does TortoiseSVN explicitly diverge from the cmd client in this case?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-07 19:13:44 CEST

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