Tool to generate a Perforce unified-diff from open or shelved changelists supporting add, edited and deleted files.

See help via p4-diff --help.

p4-diff -c default > default.diff

p4-diff -c 123456 -s > shelved_123456.diff

p4-diff -c 123456 > opened_123456.diff

cd ~/other_source
patch --dry-run -Np6 -i opened_123456.diff