0

当我试图和解时,我有时会被这个警报打断。我怎样才能进行正常的协调?

http://i.imgur.com/cVLHh.png

有时,当我尝试取消协调时,我也会看到同样的警报。为什么 P4V 不直接带我回到主窗口?

4

2 回答 2

1

Direct Answer: Normally you can ignore that popup by clicking on cancel. It will do an "un-Advanced" reconcile. But behavior may depend on your client/server versions...

This page http://www.perforce.com/perforce/doc.current/manuals/p4v/Managing_lost_connection.html describes "Advanced Reconcile" as an "optional" step, but does not explain wtf (why the f) they had to add it.

I never had a problem with the reconcile before they introduced Advanced, but now it seems that a reconcile can fail to actually reconcile everything and you need to do an advanced reconcile to get the files it missed.

Lesson learned... After a "normal" reconcile (by click on "Cancel" the first time), do the reconcile again and select advanced (which does a folder diff), it shouldn't produce anything, but if it does, then you need to review those files.

于 2013-08-10T01:43:54.020 回答
0

您能否发布一个示例,说明“高级协调”对话框在您打开时的样子?这将有助于诊断基本协调不起作用的原因。例如,如果您告诉 P4V 您要添加一个文件,然后将其从磁盘中删除,则基本的协调不起作用。

FWIW,我通常会进入命令行并p4 reconcile作为更快的选项运行。

于 2012-10-05T14:10:44.247 回答