How to apply a Perforce patch?

diff perforce patch
slaphappy picture slaphappy · Feb 24, 2012 · Viewed 24.8k times · Source

I generated a patch some time ago using the p4 diff command.

However, now that I want to apply it, I realize that there is no way to apply a patch in Perforce.

Since I did not use the -du option, the patch is in that obscure perforce format and can't be applied with patch(1). The original changes have been lost. Also, that patch is over 300kb long so manual editing isn't really an option.

What are my options ? Are there patch converters, or some Perforce extension allowing the application of these kind of patchs ?

Answer

Jason Spangler picture Jason Spangler · Jul 8, 2016

Perhaps Perforce's diff output format has changed, but @RumburaK's answer didn't work for me.

I had to modify it to convert the ==== header to diff's +++ and --- header format.

sed -Ee 's|==== (//.*)#[0-9]+(.*)|+++ \1\n--- \1|' < infile.txt > outfile.txt

infile.txt was generated with the following command (where 12335 was a shelved changelist): p4 describe -du -S 12345

outfile.txt was applied with the following command: patch -p3 -l < outfile.txt

Related questions

Perforce - How to get the list of files that have been modified locally?

I am looking for a perforce command to get the list of the files that have been modified locally and "not" checked-in to the repository. I understand that I "should" get the list of modified files in Pending changelist, but …

Read More
Perforce - create patch file of differences against have revision

In Perforce, how can I create a patch file which has the changes that are in the file as currently saved, compared to the have revision? Instructions for either the GUI client or the CLI client would be great. I …

Read More
Perforce -- generate a diff including added files?

When I use "p4 diff", it ignores files that I have open for add. Is it possible to generate a diff that includes added files as well as changed files?

Read More