如何在RTC中交付更改集后将其丢弃 [英] How to discard the change set once delivered in RTC
问题描述
我不小心交付了变更集,其中包括一些其他配置文件,这些文件在RTC中具有本地系统特定的配置.一旦交付,是否有任何方法可以丢弃这些更改?我的意思是,更改不应作为其他团队成员的即将到来的更改来进行.
I accidentally delivered the change set which include some additional config files having local system specific configuration in RTC. Is there any way to discard those changes once delivered? I mean the changes should not be come as incoming changes to other team members.
请提供任何指针.
推荐答案
一旦交付,是否有任何方法可以丢弃那些更改?
Is there any way to discard those changes once delivered?
不完全是:一旦交付,变更集 就会作为其他信息传入其他团队成员.
Not exactly: once delivered, that change set will come to the other team members as incoming.
有两种解决方案:
- 将流配置恢复为交付之前的状态.仅当您要提供除变更集之外的基准时,这才很容易,因为您可以随后打开流,并在组件"部分中单击替换为",然后用先前的基准替换提供的基准.
但是...如果您从未交付过基准(并且仅交付了变更集),那根本就不容易.
您可以尝试并遵循"是否可以根据过去的日期创建RTC快照或基准?",但是那是很乏味的.
另外,如果您的同事已经接受了您的变更集并开始提供自己的变更集,则完全不建议使用此解决方案.
But... if you never delivered baselines (and delivered only change sets), this isn't easy at all.
You can try and follow "Is there a way to create a RTC snapshot or baseline based on a past date?", but that is quite tedious.
Plus, if your colleagues already accepted your change set and started delivering change sets of their own, this solution isn't recommended at all.
- 或更简单地说,您创建一个新的变更集,该变更集将取消您刚刚提供的变更集.
- 右键单击您的组件,然后选择
show > history
,然后右键单击您错误地传递的最新更改集,然后选择revert
.
这将创建一个补丁. - 右键单击该补丁,然后选择"
apply to your workspace
":这将创建一个变更集,该变更集是已交付的变更集的负像.
交付新的变更集.
- Or, much simpler, you create a new changeset which will cancel the one you just deliver.
- Right-click on your component, and select
show > history
, then right click on the latest change set you incorrectly delivered, and selectrevert
.
That will create a patch. - Right-click on that patch, and select "
apply to your workspace
": that will create a change set which is the negative image of the one already delivered.
Deliver that new change set.
这意味着您的同事将必须接受这两个变更集:不正确的变更集和将其取消的新变更集.
That means your colleagues will have to accept both change sets: the incorrect one, and the new one which cancels it.
This thread introduces a variation of the first alternative:
您确实可以从将更改集传送到的流中删除它.
您可以通过以下方式做到这一点:you can really remove the change set from the stream you delivered it to.
You can do this by:- 丢弃本地工作区中的更改集
- ,然后将流的内容替换为工作区中受影响的特定组件的内容.
这是一个风险更大的解决方案,因为它确实用工作区中的所有内容替换流中的内容...它将删除流中没有的任何内容您的工作区.为此:
This is a more risky solution, because it really replaces the content of the stream with whatever you have in your workspace... it will remove anything in the stream that you don't have in your workspace. To do this:
- a.接受您正在使用的流中的所有传入更改(以防止丢失其他人的工作).
- b.在
Pending Changes
视图中右键单击拥有的组件,然后选择Show->History
.更改集将显示在History
视图中. - c.右键单击更改集,然后选择
Discard
....这将从您的工作空间中删除更改集.
因此,您的工作区现在应具有要删除的流 之外的所有更改.您可以通过检查不良更改集是否是唯一收到的东西来验证这一点.
d.右键单击该组件,然后选择"
Replace in [your stream name]
..." - Right-click on your component, and select
- a. Accept any incoming changes from the stream you are working with (to prevent losing anyone else's work).
- b. Right click on the owning component in the
Pending Changes
view and selectShow->History
. The change set will appear in theHistory
view. - c. Right click on the change set and choose
Discard
... This will discard the change set from your workspace.
So your workspace should now have all change from the stream except the one you want to remove. You can verify this by checking that your bad change set is the only thing you see Incoming. - d. Right click on the component and choose "
Replace in [your stream name]
..."
这篇关于如何在RTC中交付更改集后将其丢弃的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!
- 右键单击您的组件,然后选择