[#QB-4177] Issue with Merging Shelved Changelist

QuickBuild

Issue with Merging Shelved Changelist

Created: 29/Apr/25 01:11 AM Updated: 21/May/25 01:39 AM

Component/s:

None

Affects Version/s:

14.0.28

Fix Version/s:

None

Original Estimate:

Unknown

Remaining Estimate:

Unknown

Time Spent:

Unknown

Description

« Hide

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

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Robin Shen [29/Apr/25 06:16 AM]

Please check "Revert Option" in shelve setting of the repository. If set to "Revert after current build", the unshelved changes will be reverted after build is finished.

[ Permlink | « Hide ]

Phong Trinh [01/May/25 07:13 PM]

Thank you for promptly response, Robin!
Yes, I set 'REVERT_AFTER_CURRENT_BUILD' in the repository settings. I wonder this issue happened on Windows build, but Linux build..

[ Permlink | « Hide ]

Robin Shen [02/May/25 12:55 AM]

The behavior is the same at my side both on Windows and Linux. I've done below:

1. Add a new file say "test.txt" in my p4 workspace
2. Sheve the changes
3. Now run build with the selved changes. The build has a step to print workspace files, and build log shows that file "test.txt" exists
4. Check workspace files at QB side for the configuration, and test.txt is not there which is expected for option "revert after current build"

[ Permlink | « Hide ]

Phong Trinh [15/May/25 01:58 AM]

Thank you for promptly response, Robin!
In my case, the file had disappeared in your step 3. I worked around the issue by changing the sync mode to POPULATE_SYNC.

[ Permlink | « Hide ]

Phong Trinh [20/May/25 11:31 PM]

I no longer see the issue. Please close the ticket. I will open a new one if it happens again. Thank you!