perforce find files not in depot

Here is how you find files not added to depot:

find . ! -type d | xargs p4 have 2>&1 > /dev/null

 

perforce sync changes from main branch

p4 integrate -b childBranchName

p4 resolve -as

p4 submit 

 

perforce merge branch

To merge changes from the secondary to the main branch

• make sure you have both the main and secondary branch in p4 client
• go to the main branch directory 

p4 integrate /file/path/to/secondary/branch/file.ext /file/path/to/main/branch/file.ext

p4 resolve  /file/path/to/main/branch/file.ext

p4 submit 

 

perforce equivalent cvs commands

add = p4 add file.name
checkout = p4 sync
p4 edit file.name (do this before you make any changes)
diff = p4 diff file.name
commit = p4 submit file.name
p4 revert file.name (close file without doing any changes)
log = p4 filelog file.name