Is there a way to accept changes in individual files in a changeset rather that the whole set?
The issue in a nutshell is that when merging changes from a different steam, and one changeset has files with different encodings, it causes a Java Null Pointer Exception (NPE). Is there a way to accept changes in individual files in a changeset rather that the whole set? I can then accept most of the changes and manually do the odd ones.
This is a known defect Defect (335164 - NPE merging an encoding change in the Gap workflow) in version 4.0.7 of RTC. This is marked as fixed in 6.0 Sprint 7, but we cannot upgrade the RTC server for some time. Does anybody know of a workaround?
This is a known defect Defect (335164 - NPE merging an encoding change in the Gap workflow) in version 4.0.7 of RTC. This is marked as fixed in 6.0 Sprint 7, but we cannot upgrade the RTC server for some time. Does anybody know of a workaround?
Accepted answer
You can create a patch from the change set and apply that to your workspace. Then you can mark the conflicts as resolved when you commit the changes.
In the Eclipse client, you can create a patch from one or more change sets by selecting them an running 'New > Patch'. That will place a patch into your Pending Changes view. You can then apply the specific changes you care about.
Comments
Great! But how do you create a patch from a delivered changeset?
I've expanded the answer to be more explicit. If you want more details, let me know.
Thanks again, this works well. I did a "Show > History" in the stream, double-clicked on the relevant changeset, in the change summary selected some files/folders and right-clicked New > Patch....
One other answer
Eddie, as soon as a change set is completed, you can not move changes out of it into another change set.
Before a change set is completed, you can move changes out of it into another change set. One customer has actually created some extension to make sure that a change set only contains changes to one file, to allow cherry picking.
You could ask for a fixpack for your version.
Before a change set is completed, you can move changes out of it into another change set. One customer has actually created some extension to make sure that a change set only contains changes to one file, to allow cherry picking.
You could ask for a fixpack for your version.