How to merge external files with files in RTC component?
2 answers
- Load that repository workspace into a sandbox on your local drive
- Use a file system copy that warns you about overwriting existing files (such as the standard Windows file system copy) to copy your local files into the desired location in the sandbox.
Comments
Thanks.
You could:
- Replace the component baseline in your workspace with the Initial Baseline.
- Copy all your files into the now empty root directory of the component
- Checkin all of your files
- Accept the incoming changes from the stream.
But you will have to be careful how you do your merges.
You might want to try both techniques, and see which one is simpler (you can just keep the change-set from the technique you prefer, and discard the other).
You could:
- Replace the component baseline in your workspace with the Initial Baseline.
- Copy all your files into the now empty root directory of the component
- Checkin all of your files
- Accept the incoming changes from the stream.
But you will have to be careful how you do your merges.
You might want to try both techniques, and see which one is simpler (you can just keep the change-set from the technique you prefer, and discard the other).
Thanks!
Get the local-drive details of RTC Workspace, where the stream-contents are loaded. Update it once. Then, you can directly copy the new contents from the local drive to the RTC-Workspace mapped location.
This will be a file-system level copy and it will prompt you if there are files with same names. You can choose to overwrite. Once its copied, the new contents will be available in Eclipse -> "Pending changes" view.
During "Check-in" operation, RTC will warn if there are conflicts in file contents and at this point, you can compare the contents using editor.
Thanks.
Comments
I overwrote a file on my local system. It showed up in my pending changes, but when I "checked in and deliver" it didn't prompt me for conflict. It just accepted the change that I pasted in the local system file (overwritten file).
If there is a conflict, where RTC is unable to merge the 2 files, it will prompt.
You can check the differences by using "compare with previous version" option on the file->right-click in eclipse.
Thanks.
I was hoping that it will not even deliver the change, it should have shown conflict in the very first attempt of "Checkin and Deliver". It should have shown conflict because, the file existing in component has some content which is different then the content of file I pasted on local system workspace (the file names are same).
I was hoping that it will not even deliver the change. It should have shown conflict in the very first attempt of "Checkin and Deliver". It should have shown conflict because, the file existing in component has some content which is different then the content of file I overwrote on locally loaded workspace (the file names are same).
All versions that we check-in will have some different contents - i dont think you will get conflicts for every check-in, only in cases, where RTC is not able to update the existing, it will show conflicts, where user can resolve it.