如何在 Perforce 中协调较新的工作区文件与 depot? [英] How to reconcile newer workspace files with depot in Perforce?

问题描述

我的仓库说它有一堆不同文件的最新版本，但我的本地工作区实际上有更新的修订版.我的工具(P4V 和 VS 插件)错误地告诉我一切都是最新的.

I have a situation where my depot is saying it has the latest version of a bunch of different files but my local workspace actually has newer revisions. My tools (P4V and VS plugin) are incorrectly telling me that everything is up-to-date.

我可以证明情况确实如此，因为如果我检出文件，不做任何更改，然后提交，则更改已提交且历史记录显示正确并且get latest 在其他机器上的操作拉取正确版本的文件.

I can prove this is the case because if I check out the file, make no changes, and submit, the changes are committed and the history appears correct and get latest operations on other machines pull the correct version of the file.

这不是一个真正可行的解决方案，因为可能有很多文件需要此修复程序，而我无法知道我已经修复了所有文件.

This isn't really a viable solution as there could be many files that require this fix and I have no way of knowing I have fixed them all.

我认为这个问题是由于偶尔脱机工作和(错误地)在我需要进行更改时摆弄文件上的只读标志造成的.

I believe the issue has come about due to occasionally working offline and (incorrectly) twiddling the read only flag on the file when I needed to make a change.

所以我的问题:

是否有我可以运行的命令(或类似命令)可以查看我的工作区文件并查看是否存在尚未提交的更改.基本上忽略文件的报告"状态?类似于同步但相反的东西?这将允许我强制提交"所有这些文件并使仓库处于正确状态.

Is there a command (or similar) I can run that will look at my workspace files and see that there is a change that hasn't been committed. Essentially ignoring the 'reported' state of the file? Something like sync but in reverse? This would allow me to 'force commit' all those files and get the depot in the correct state.

推荐答案

您要查找的命令称为p4 reconcile".以下是一些背景信息:工作与 Perforce Server 断开连接.

The command you are looking for is called 'p4 reconcile'. Here's some background information: Working Disconnected from the Perforce Server.

这篇关于如何在 Perforce 中协调较新的工作区文件与 depot?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！