将文件从一个 Team Foundation 项目移动到另一个 Team Foundation 项目
我们的项目已经达到了需要将一些代码拆分到一个单独的团队基础项目中的地步。我们希望移动这些文件,以便它们保留其版本控制历史记录。我们暂时将文件复制回原始团队基础项目并重新添加它们,以便我们的日常构建和构建能够顺利进行。测试过程不会中断。因为我们能够修改我们的构建和测试过程中我们将开始删除这些临时副本。
我们注意到的一个问题是,我们有一个夜间脚本,用于检查各种维护分支,以查看是否存在尚未合并回主干的变更集。它现在抱怨之前已经合并过的变更集。这些变更集似乎与已移动和重新添加的文件相关。关于为什么我们会看到这种情况以及我们如何丢弃这些合并候选者有什么想法吗?如果我们进行合并/丢弃,TF 会告诉我们“没有要合并的更改”。似乎很困惑。这种方法还可能遇到其他问题吗?也许有更好的方法?
Our project has hit a point where we need to split off some code into a separate team foundation project. We would like to move these files so they retain their version control history. Temporarily we are copying the files back to the original team foundation project and re-adding them just so that our daily build & test process doesn't break. As we are able to modify our build & test process we will start to remove these temporary copies.
One issue we are noticing is that we have a nightly script that checks various maintenance branches to see if there are changesets that haven't been merged back to trunk. It is now whining about changesets that have been merged before. These changesets seem to be related to the files that have been moved and re-added. Any ideas as to why we are seeing this and how we can discard these merge candidates? If we do a merge /discard TF tells us "there are no changes to merge". It seems to be confused. Also are there other problems we might run into with this approach? Perhaps there is a better approach?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
我发现的解决方案是合并/丢弃所有其他变更集,然后执行“追赶”合并/丢弃,即不指定任何版本信息。这生成了许多与合并相关的挂起更改,但是当我去签入它们时,我收到了 TF14088 错误。此错误的解决方法是首先签入有问题的文件/文件夹,然后签入其他所有内容。
The solution that I found was to merge /discard all other changesets, then do a "catchup" merge /discard i.e. not specifying any version info. This generated a number of merge related pending changes but when I went to check them in, I got a TF14088 error. The workaround for this error was to checkin just the problematic files/folders first and then check in everything else.