perforce-integrate

How to connect & perform Sync with Perforce on Mac

こ雲淡風輕ζ 提交于 2019-12-22 10:05:31
问题 I am trying to access perforce and perform Sync operation from command line on Mac machine OS x 10.8.5 Can any one tell me how to access perforce for command line. I have placed p4 client in /usr/bin directory, From Terminal when i execute command : P4 or p4 help, im getting below error message. Perforce client error: Connect to server failed; check $P4PORT. TCP connect to perforce:1666 failed. nodename not servname provided, or not known Step by step approach to set up Perforce, will be

Integrating moved files in perforce

人盡茶涼 提交于 2019-12-21 07:09:18
问题 Say I created a branch in perforce of our codebase. Here is the branch spec: //depot/code/main/... //depot/code/branch/... Then, in the branch, say I move the branched file a.txt -> b.txt using p4 integrate //depot/code/branch/a.txt //depot/code/branch/b.txt p4 delete //depot/code/branch/a.txt Now, let's say some changes are made to a.txt in main which I would like to have integrated into b.txt in the branch When I try to integrate using the original branch spec, it doesn't reflect the

Unable to create new branch in P4 using integrate

流过昼夜 提交于 2019-12-10 23:41:59
问题 I've a branch in P4 at //depot/MyDemoInfo/trunk/Server/My_Service & under My_Service, my entire source code is present. Now, When I'm trying to create a new branch from the above trunk branch, it is giving me error: I'm trying to create a new release branch as shown below: //depot/MyDemoInfo/1.0/Server/My_Service So, I issued below command after adding it in my client specs: p4 integrate //depot/MyDemoInfo/trunk/Server/My_Service/... //depot/MyDemoInfo/1.0/Server/My_Service/... It gives below

Proper way to ignore source files during Perforce integration

☆樱花仙子☆ 提交于 2019-12-10 15:52:38
问题 In my primary branch there is a change list with 10 files that I'm trying to integrate into a development branch. All of the outstanding files in the change list should be ignored, and not branched into the target. What are the steps to do the integration so that Perforce does not create the files in the target branch, and ignores the change list files for all future integrations? I originally did an integration with -Dt , and then reverted the 10 files I did not want to be created in the

How to connect & perform Sync with Perforce on Mac

拟墨画扇 提交于 2019-12-05 19:32:31
I am trying to access perforce and perform Sync operation from command line on Mac machine OS x 10.8.5 Can any one tell me how to access perforce for command line. I have placed p4 client in /usr/bin directory, From Terminal when i execute command : P4 or p4 help, im getting below error message. Perforce client error: Connect to server failed; check $P4PORT. TCP connect to perforce:1666 failed. nodename not servname provided, or not known Step by step approach to set up Perforce, will be greatly appreciated Note: P4V gui version is working fine, I need to execute Sync command from Command line

Integrating moved files in perforce

*爱你&永不变心* 提交于 2019-12-03 23:38:08
Say I created a branch in perforce of our codebase. Here is the branch spec: //depot/code/main/... //depot/code/branch/... Then, in the branch, say I move the branched file a.txt -> b.txt using p4 integrate //depot/code/branch/a.txt //depot/code/branch/b.txt p4 delete //depot/code/branch/a.txt Now, let's say some changes are made to a.txt in main which I would like to have integrated into b.txt in the branch When I try to integrate using the original branch spec, it doesn't reflect the changes made to a.txt in main onto b.txt - is there any way to have the changes made in main show up in the