Archive

Archive for the ‘perforce’ Category

perforce find files not in depot

January 29, 2008 varnit Leave a comment
Here is how you find files not added to depot:

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

Categories: perforce

perforce sync changes from main branch

January 8, 2008 varnit Leave a comment

p4 integrate -b childBranchName

p4 resolve -as

p4 submit 

Categories: perforce

perforce merge branch

January 8, 2008 varnit Leave a comment

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 

Categories: perforce

perforce equivalent cvs commands

November 8, 2007 varnit Leave a comment

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

Categories: perforce