A colleague has created a perforce change list and has posted a review on review board for the change. Alas the change is not shelved, but I need to apply the change to my code. The colleague will not be available for some days so I can not ask him to shelve the files or to give me a unified diff of the files. So all I have now is the code review. From reviewboard I can download the perforce patch for the change. Please note this is not unified diff(like the output of p4 diff -du), but is some other format. Now my question is - is there a way I can apply this patch to another perforce client? Or maybe to convert the diff to unified diff so that I can use linux patch command?
Asked
Active
Viewed 1,133 times
1
Ivaylo Strandjev
- 69,226
- 18
- 123
- 176
-
Depending on the size of the patch, you can always use your text editor. The patch file lists the lines to be inserted and deleted, and the line numbers in the file where the changes are to be made., so you can perform those inserts and deletes yourself, by cutting-and-pasting from the patch file into the modified file in your editor. – Bryan Pendleton Jun 15 '15 at 13:33
-
I can also use the review for that. This is the only option I found so far. However the change is quite big so I wanted to find an alternative if possible – Ivaylo Strandjev Jun 15 '15 at 13:43