Using Subversion (TortoiseSVN/CollabNet Edge); building an .msi (Visual Studio Installer project type) wipes out the .svn files in the directory and creates subversion conflicts. TortoiseSVN won't allow the Resolve command. How to resolve the conflicts?
views:
13answers:
1
A:
Delete the parent directory (or move it to a different location) and do an svn update on the parent directory.
Svn can't do anything if the .svn folders are missing. So you have to give svn a chance to recover its own directory structures.
tangens
2010-10-01 18:22:53
There are changes in the files that need to be committed. If the parent directory is deleted (or moved), the update will bring in files that don't have the changes which will need to be again updated in Visual Studio creating the same problem.
Michelle
2010-10-01 18:26:55
It is the Visual Studio process of building the .msi for release which wipes out the files and replaces them with new ones.
Michelle
2010-10-01 18:28:56
You could copy the files back from the location you made your backup and then do the commit.
tangens
2010-10-01 18:29:53
belwood, I agree. But the developer in question is adamant that these files be under source control.
Michelle
2010-10-01 18:30:14
tangens, we're in the process of seeing if we can make that work.
Michelle
2010-10-01 18:31:09