"Rollback ..."和"Rollback ..."之间有什么区别和“退出提交的更改列表#####"在Perforce P4V中 [英] What is the difference between "Rollback..." and "Back Out Submitted Changelist #####" in Perforce P4V

问题描述

我想撤消其中一项签到的更改.在特定变更列表的右键单击上下文菜单中，有以下两个选项:

I want to reverse the changes from one of my checkins. In the right-click context menu of the particular changelist, there are these two options:

• 回滚...
• 撤回已提交的更改列表

这两者之间有什么区别?在什么情况下我应该使用其中一种?

What is the difference between these two? In what situations should I use either one?

推荐答案

与使用p4 obliterate命令(和您不需要管理员权限即可使用它们).

Both of these operations restore a set of files to a previous state and are essentially faster, safer ways of undoing mistakes than using the p4 obliterate command (and you don't need admin access to use them).

在回滚..."的情况下，该文件可以是任意数量的文件，甚至可以是整个软件仓库.您可以告诉它回滚到特定的修订版，变更列表或标签.这些文件将还原到创建该修订版本，变更列表或标签时的状态.

In the case of "Rollback...", this could be any number of files, even an entire depot. You can tell it to rollback to a specific revision, changelist, or label. The files are restored to the state they were in at the time of creation of that revision, changelist, or label.

对于回退已提交的更改列表#####"，还原操作仅限于在更改列表#####中提交的文件.如果此后未对这些文件进行任何更改，这些文件将还原到提交该更改列表之前的状态.如果对这些文件中的任何一个进行了后续更改，Perforce将告诉您这些文件现在已过期.您将必须同步至主修订版，然后解决差异.这样，您就不会无意间破坏了您真正想要保留的任何更改.

In the case of "Back Out Submitted Changelist #####", the restore operation is restricted to the files that were submitted in changelist #####. Those files are restored to the state they were in before you submitted that changelist, provided no changes have been made to those files since. If subsequent changes have been made to any of those files, Perforce will tell you that those files are now out of date. You will have to sync to the head revision and then resolve the differences. This way you don't inadvertently clobber any changes that you actually want to keep.

这两个操作基本上都是通过将旧修订提交为新修订来进行的.当您执行回滚..."时，您将将文件恢复到特定时间点的状态 ，而不管它们之后发生了什么.当您执行退出..."时，您尝试撤消在特定时间点所做的更改，同时保持此后发生的更改.

Both operations work by essentially submitting old revisions as new revisions. When you perform a "Rollback...", you are restoring the files to the state they were in at a specific point in time, regardless of what has happened to them since. When you perform a "Back out...", you are attempting to undo the changes you made at a specific point in time, while maintaining the changes that have occurred since.

这篇关于"Rollback ..."和"Rollback ..."之间有什么区别和“退出提交的更改列表#####"在Perforce P4V中的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！