简体   繁体   English

VS2010上的TFS,合并代码问题

[英]TFS on VS2010, merging code issues

Recently we have been having problems with TFS and our code base. 最近我们遇到了TFS和我们的代码库问题。 We have a section of tests that use Webdriver, and a section that use Coded UI. 我们有一部分使用Webdriver的测试,以及一个使用Coded UI的部分。 Lately, we've been having problems merging our code after a new build has been pushed out. 最近,在推出新版本后,我们在合并代码时遇到了问题。 Some folders show up as a white outline of a folder, which we can right click and select "include in project". 某些文件夹显示为文件夹的白色轮廓,我们可以右键单击并选择“包含在项目中”。 We also notice some files missing, and we can't "get latest" to grab them. 我们还注意到一些文件丢失了,我们无法“获取最新信息”来抓住它们。 We have to go some round about way to do it (shelve code, delete local files, get latest, merge code). 我们必须采取一些方法来做它(搁置代码,删除本地文件,获取最新,合并代码)。 Even when we do that we still have some issues. 即使我们这样做,我们仍然有一些问题。

But the main issue we are having is that our Coded UI maps are breaking. 但我们遇到的主要问题是我们的编码UI地图正在破碎。 Instead of being the normal structure such as: 而不是像以下那样的正常结构:

.uitest .uitest

----.cs ----。CS

----.designer.cs ----。designer.cs

When we merge in the new code, the UI maps break out like: 当我们合并新代码时,UI映射会突破:

.cs 的.cs

----.designer.cs ----。designer.cs

.uitest .uitest

I opened the .csproj in notepad++ and noticed that both the .cs and .designer.cs files no longer have a dependancy of the .uitest file. 我在notepad ++中打开了.csproj,注意到.cs和.designer.cs文件不再具有.uitest文件的依赖性。 Now the .cs file has no dependancy, and the .designer is dependant on the .cs file. 现在.cs文件没有依赖性,而.designer依赖于.cs文件。 We can fix it with relative ease, but it keeps breaking in every build and we have several maps we need to fix. 我们可以相对轻松地修复它,但它在每个构建中都会中断,我们需要修复几个映射。 What exactly could the problem be here? 问题究竟在这里究竟是什么? Also, referring to my frist problems of files not being included in the project, what could the issue be there? 另外,谈到我的文件未包含在项目中的问题,问题可能是什么?

I asked the same question on the MSDN forums, but the suggestions I have received I have already tried, like creating a new workspace since the other might be corrupt. 我在MSDN论坛上问了同样的问题,但是我收到的建议我已经尝试过了,比如创建一个新的工作区,因为另一个可能已经损坏了。 Still didn't work. 仍然没有奏效。

Thanks in advance 提前致谢

Edit: Had a suggestion on the MSDN forums to run VS as administrator. 编辑:在MSDN论坛上有一个建议以管理员身份运行VS. That didn't work either. 那也行不通。 Not really sure what could be causing this issue. 不确定是什么导致了这个问题。 It doesn't seem to be causing problems for everybody because some new builds cause issues for some people but not others. 它似乎并没有给每个人带来问题,因为一些新的构建对某些人而不是其他人造成问题。 Some more info would be I run on Windows 7 64bit and Visual Studio Ultimate 2010. 我将在Windows 7 64位和Visual Studio Ultimate 2010上运行更多信息。

In the past I've had issues with TFS that sound similar, 2 of our developers seemed to periodically create problems when merging files into the data store, folders and files would show as not included while the project file would make it in (breaking everything after get latest). 在过去,我遇到的TFS问题听起来很相似,我们的开发人员似乎在将文件合并到数据存储中时会定期出现问题,文件夹和文件在项目文件进入时会显示为未包含(打破所有内容)得到最新的)。 Eventually the problem went away but we never truly found the source. 最终问题消失了,但我们从未真正找到过来源。 I believe it had something to do with our network - maybe a switch issue in combo with the way we mapped working folders to network drives pointing to a shared dev server. 我认为它与我们的网络有关 - 可能是我们将工作文件夹映射到指向共享开发服务器的网络驱动器的方式的交换机问题。 Also one of the workstations seemed to have a problem with windows explorer not seeing file updates on the dev server share... developer would have to hit \\servername\\C$\\sharefolder then hit his mapped network drive again before updates would refresh. 另外一个工作站似乎有一个问题,Windows资源管理器没有看到开发服务器共享上的文件更新...开发人员必须点击\\ servername \\ C $ \\ sharefolder然后再次点击他的映射网络驱动器更新将刷新。 (And his check in's created the most problems) ... we ran VS2008, TFS2010 (他的签入创造了最多的问题)......我们运行了VS2008,TFS2010

Just some ideas... 只是一些想法......

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM