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

conflict with external removes files

From: Andrew Sasak <andrew.sasak_at_gmail.com>
Date: Thu, 12 Mar 2009 16:32:54 -0400

I noticed this using a pre 1.6 version of TortoiseSVN. The repository is has
no elements other than a set of externals. On my working copy I changed one
of the externals to point to a branch instead of the trunk. I added files to
the subdirectory and committed to the branch. I then updated at the root,
which now had new externals, which resulted in a conflict, and overwrote my
change to the externals so that it pointed to the trunk and continued
updating, deleting my local files that were unique to the branch. Especially
troubling were the uncommitted changes to these files, although I was able
to restore from backup. Will the "Detection of tree conflicts" feature in
1.6 prevent this? If not, I would consider this a bug with a resolution of
stopping an update when a conflict occurs with an external.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-12 21:33:41 CET

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

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