Using the output of diff to create the patch

Question

Hello, I have something like this

src/sim/simulate.cc
41d40
< #include "mem/mem-interface.h"
90,91d88
<             dram_print_stats_common(curTick/500);
<
src/mem/physical.hh
52d51
<   public:
55,56d53
<       public:
<
58a56,57
>       public:
>
61,62c60,61
<         virtual bool recvTiming(PacketPtr pkt); //baoyg
<
---

I believe this was created using the diff command in a source tree. What I want is create the patch using that output, to apply the same changes to my source tree. I do not have many idea about this, so correct me If my question does not make any sense.

Thank you.

Answer 1

I believe that diff -u oldfile newfile > a.patch is used to create patch files, although some other switched may be thrown in as well (-N?).

Answer 2

What you have there is a non-unified diff. patch can read it, but will be unable to make context matches and is more likely to make mistakes.

Answer 3

That is a (partial) patch file, though it would have been better if they provided you with a unified diff output.

The main issue with that patch is that it doesn't mention which files are being modified, and since there is no context provided, the files must be exact, patch will be unable to allow for minor changes in the file.

Answer 4

If you want to get the same patch output as SVN diff, given two different files:

diff -Naur file1.cpp file2.cpp