[tool] perforce

‘p4 resolve’使用 -am或-as参数

-am表示accept merged，具体为如果theirs与base一致，接受yours，如果yours与base一致，接受theirs，如果yours和theirs都与base不同，但是yours和theirs没有冲突，接受自动merged的结果，否则如果yours和theirs也有冲突，则忽略此文件。
-as比-am更严谨，不管yours与theirs是否有冲突，只要yours和theirs都与base有不同就忽略此文件。

p4 changes -s pending -u shaoxinw  //查看shaoxinw修改的状态为pending的changelist

-m max	List only the highest numbered max changes.
-t	Display the time as well as the date of each change.

p4 info: 

User name: joe
Client name: joes_client
Client host: joes_workstation
Client root: /usr/joe/projects
Current directory: /usr/joe/projects/source
Client address: 192.168.0.123
Server address: p4server:1666
Server root: /usr/depot/p4d
Server date: 2012/01/28 12:11:47 -0700 PDT
Server uptime: 752:41:33
Server version: P4D/FREEBSD/2012.1/406375 (2012/01/25)
Server license: P4Admin <p4adm> 20 users (expires 2013/01/01)
Server license-ip: 10.0.0.2
Case handling: sensitive