I enabled 'Merge With Shelved Changes' in my repository settings. I modified FileA.h and shelved it in changelist 101 for example. When i ran the build, i saw that FileA.h was merged and displayed in SCM Changes as Shelved Changes. However, the file disappeared on the workspace. This issue happened on Windows build system, but Linux system. I turned the debug on and checked the commands which QuickBuild executed. Looks like QB unshelve the changelist, checked for conflicts (there were no conflicts) Then it did the force sync, and this file was deleted. Can you look into this?
Thank you in advance,
ptrinh
Description
I enabled 'Merge With Shelved Changes' in my repository settings. I modified FileA.h and shelved it in changelist 101 for example. When i ran the build, i saw that FileA.h was merged and displayed in SCM Changes as Shelved Changes. However, the file disappeared on the workspace. This issue happened on Windows build system, but Linux system. I turned the debug on and checked the commands which QuickBuild executed. Looks like QB unshelve the changelist, checked for conflicts (there were no conflicts) Then it did the force sync, and this file was deleted. Can you look into this?
Thank you in advance,
ptrinh