如何将特定的变更集版本视为相对于最新版本的更改? [英] How to get specific changeset version treated as changes relative to latest version?

问题描述

我回滚了一个变更集.现在我需要检查通过已实现"挂起更改回滚的变更集.就像一切都在提交更改之前一样.

I rolled back a changeset. Now I need to check out the changeset that was rolled back with 'actualized' pending changes. So like everything is before the commit of the changes.

当我获得带有文件覆盖的特定版本时，我在待定更改窗口中看不到任何内容.我怎样才能得到我需要的状态?可能吗?

When I get specific version with files override I see nothing in pending changes window. How can I get the state I need? Is it possible?

推荐答案

执行获取特定版本"后，您需要手动检出变更集中的每个文件(右键单击，检出).确保您已关闭结帐时获取最新信息".

After doing the "Get Specific version" you need to check out every file in the changeset manually (right-click, check-out). Be sure that you have the "Get latest on checkout" turned off.

之后执行 get latest，这将提示您合并.这将是一个更棘手的合并，因为 Visual Studio 将假定较新的版本是您想要的.满意后，请签入代码.

After that perform a get latest, which will prompt you to merge. This is going to be a more tricky merge, since Visual Studio will assume that the newer version is what you want. When you're satisfied, check in the code.

或者从与第一个解决方案相同的步骤开始，但您可以在签出每个文件后创建一个架子集，然后执行获取最新信息，而不是立即执行获取最新信息.当您使用目标版本时，取消搁置更改，解决所有冲突并重新签入.

Alternatively start with the same steps as the first solution, but instead of immediately doing a get-latest, you can create a shelfset after you've checked out each file and then perform a get latest. When you're on the target version, unshelf your changes, resolve any conflicts and check them back in.

您可以应用的另一个技巧是找到包含回滚更改的变更集编号.由于此签入是补偿签入，您还可以通过回滚该补偿变更集来重新进行更改.我在本地工作区中尝试了此操作，并且可以正常工作.同样，您可能需要进行合并，而且很难准确地判断要选择哪些更改.

Another trick you could apply is to find the changeset number that contains the rolled back changes. Since this checkin is a compensating checkin, you might also be able to re-do the changes by rolling back that compensating changeset. I tried this in a local workspace and it works. Again you might need to go through a merge and it's hard to tell exactly which changes to pick.

对此我最好的建议是:尽量不要陷入这种情况:)

My best advice on this is: try not to get into this situation :).

这篇关于如何将特定的变更集版本视为相对于最新版本的更改?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！