Create a patch?

swanson · 2012-03-06 10:42:33

Wittfella has kindly made a special piece of code, just for me, for his great filemanager Qtfm. I can apply it manually with the aid of nano. and it compiles fine. But, I've tried to make a patch with diff and patch but it is a bit over my IQ. Somehow I managed to reverse the patch and so destroyed the special code (backups are great).

Scenario;
Doc 1; special mainwindow.cpp complete or just with code snippet I need.
Doc 2; Qtfm newest source mainwindow.cpp

Desired result; put the code snippet from the special mainwinow.cpp into the new mainwindow.cpp, either from the complete file or a file with just the appropirate code sequence/snippet.

Of course, at one point the new code will change so that the special code snippet won't work anymore. But that's far off in the future.

Any hints are appreciated.

.:B:. · 2012-03-06 10:44:26

$ diff -Naur $file1 $file2 > $patch

should work fine in most cases.

the.ridikulus.rat · 2012-03-06 11:18:43

.:B:. wrote:

$ diff -Naur $file1 $file2 > $patch
should work fine in most cases.

One thing I am confused about patches are, when using 'git diff' generated patches I have to do 'patch -Np1' while for other patches I have to use 'patch -Np1'. I don't understand the difference between -Np0 and -Np1 and the whole strip lines concept.

tomk · 2012-03-06 12:24:26

Have you read man patch? There are examples that I find quite useful.

Arch Linux

#1 2012-03-06 10:42:33

Create a patch?

#2 2012-03-06 10:44:26

Re: Create a patch?

#3 2012-03-06 11:18:43

Re: Create a patch?

#4 2012-03-06 12:24:26

Re: Create a patch?

Board footer