p4 login
p4 -p 10.21.0.3:1999 sync -f //depot/sw/branches/olca/...#head
p4 edit xxxx.c
modify or
patch -p4 < ./xxx.diff
p4 diff -du
p4 revert ...
p4 login
p4 -p 10.21.0.3:1999 sync -f //depot/sw/branches/olca/...#head
p4 edit xxxx.c
modify or
patch -p4 < ./xxx.diff
p4 diff -du
p4 revert ...