[p4] Help

abebal at pandora.intra.kyocera-wireless.com abebal at pandora.intra.kyocera-wireless.com
Fri Dec 28 12:29:03 PST 2001


Created a branch using a branch specs, for eg
//folderA/... //folderB/...

Now folderB is a branch of folderA, deleted a file from folderB and then 
recovered it by
1. Right Clicked on folderB and selected Show Deleted depot files
2. Right clicked the deleted file and sync it to "Date and time".
3. Added the file back to the folderB

Made some changes to this files and tried to integrate the changes to 
folderA, the problem is when i try to do this it say
"Can't integrate the file in folderA from folderB. Please use the "Enable 
Baseless merged" option"

Can anyone please tell me what's wrong and why i am getting this message.

Thanks
Arshad Bebal




More information about the perforce-user mailing list