VS2010 .filter files and SVN

Posted by Noah Roberts on Stack Overflow See other posts from Stack Overflow or by Noah Roberts
Published on 2010-04-23T17:25:17Z Indexed on 2010/04/23 17:33 UTC
Read the original article Hit count: 403

Filed under:

visual-studio-2010

|

subversion

Since we've switched to VS2010 we've noticed a new .filters file that apparently contains the filter structure of the project. We're also using subversion as our source control.

Unfortunately, every time we check in now we end up with merge conflicts if anyone's added a file or filter to the project. SVN seems absolutely incapable of merging this file type correctly even though it's text based. It's getting rather frustrating.

Is anyone else dealing with this problem? Has anyone found a solution?

© Stack Overflow or respective owner

Related posts about visual-studio-2010

La version gratuite de Visual Studio 2010 est disponible, Visual Studio 2010 Express introduit des o

as seen on Developper.com - Search for 'Developper.com'
Visual Studio 2010 Express est disponible La version gratuite de Visual Studio 2010 propose à présent des outils de développement pour Windows Phone 7 Alors que Visual Studio 2010 débarque avec ses nouveautés (lire par ailleurs ici), sa version gratuite Visual Studio Express 2010 vient d'être… >>> More
Are Visual Studio 2010 Professional Solutions/Projects 100% compatible with Visual Studio 2010 Premi

as seen on Stack Overflow - Search for 'Stack Overflow'
I am just wondering on what version of Visual Studio 2010 to install (Professional or Premium) If there are a few people in the team with a mix of VS2010 professional/premium, would opening solution/project files be an issue, ie incorrect version or prompts to upgrade prjects.. Projects include:… >>> More
[ASP.NET 4.0] Persisting Row Selection in Data Controls

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
Data Control Selection Feature In ASP.NET 2.0: ASP.NET Data Controls row selection feature was based on row index (in the current page), this of course produce an issue if you try to select an item in the first page then navigate to the second page without select any record you will find the same… >>> More
Entity Framework Code-First to Provide Replacement for ASP.NET Profile Provider

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
A while back, I coordinated a project to add support for the SQL Table Profile Provider in ASP.NET 4 Web Applications. We urged Microsoft to improve ASP.NET’s built-in Profile support so our workaround wouldn’t be necessary. Instead, Microsoft plans to provide a replacement for ASP.NET Profile… >>> More
Tip#102: Did you know… How to specify tag specific formatting

as seen on ASP.net Weblogs - Search for 'ASP.net Weblogs'
Let’s see this with an example. I have the following html code on my page. Now if I format the document by selecting Edit –> Format document (or Ctrl K, Ctrl D) The document becomes I want the content inside td should remain on the same line Read More......(read more) >>> More

Related posts about subversion

Does Subversion have an analogue to VSS's links?

as seen on Stack Overflow - Search for 'Stack Overflow'
I am migrating a Visual SourceSafe code repository to Subversion and I am running into a problem. Here is a simplified layout of our current source code tree (in VSS): project_root\ |-libs\ |-tools\ |-arch_1\ | |-include | |-source |-arch_2\ |-include |-source My problem… >>> More
Complex reporting on subversion (possibly Export Subversion log into database for reporting)

as seen on Stack Overflow - Search for 'Stack Overflow'
What is the best way to do complex reporting on subversion logs like the following for each file? file, directory, last revision date, previous revision date(where revision date is at least 30 older than last), days diff(between revision dates) Since Subversion allows on revision to change multiple… >>> More
Can't install py-subversion on freebsd 8.2

as seen on Super User - Search for 'Super User'
I'm trying to install python bindings for subversion: # cd /usr/ports/devel/py-subversion # make ===> Patching for py26-subversion-1.6.15 ===> Applying extra patch /usr/ports/devel/py-subversion/../../devel/subversion/files /bindings-patch-subversion--bindings--swig--perl--native--Makefile… >>> More
Access denied error when building project in Xcode after fresh SVN checkout

as seen on Stack Overflow - Search for 'Stack Overflow'
I am seeing 2 strange access denied errors which I cant solve. This error occurs when a colleague checks out the project in SVN and it tries to find a file in my downloads folder - there is nothing in my download folder though: ProcessPCH /var/folders/f0/f01B78egHdyWY62v5MABJk+++TM/-Caches-/com… >>> More
Are there any subversion "dash board" web applications that can show me a list of recent commits from all my repositories?

as seen on Programmers - Search for 'Programmers'
I am looking for something like a subversion dashboard that at the very least can show me commits from across a group of repositories. Is there anything like this available? Since it could just as well be dead simple and I can't find anything immediately I am thinking if just scratching my own itch… >>> More