Jump to content
  • Checkout
  • Login
  • Get in touch

osCommerce

The e-commerce.

Diff Patches


Guest

Recommended Posts

I just have a quick question....

 

I am reading a contributions' README file and it says to apply the diff patch...

 

Okay.......... WTH is a diff patch and how do you execute it....

 

Thanks...

 

Hero

Link to comment
Share on other sites

  • 7 months later...
Okay.......... WTH is a diff patch and how do you execute it....

You don't execute a diff. You pass it into the 'patch' program that then uses the diff to modify your code.

 

To explain....

 

The contribution author will have used the 'diff' program to compare his/her old and new code and from this they will have generated a 'diff' file. It is this diff file (or patch file - whatever you want to call it) that you will find in the contribution you are looking at.

 

To apply the diff (or patch) file, you use the 'patch' program. This takes the 'diff' file and uses it as a set of instructions to modify your code and apply the changes. The end result should be the 'new' code that the contribution author intended.

 

If you are using a Micky Mouse toy OS like MS Windows then (as far as I know) you are stuffed because MS Windows doesn't come with anything as useful (and basic) as diff and patch and it's not available for it. It's a unix tool. I could be wrong though - maybe someone has ported it to MS Windows, though I doubt it.

 

If you are using unix, the I suggest you look at the man pages for diff and patch

 

Rich.

Link to comment
Share on other sites

If you are using a Micky Mouse toy OS like MS Windows then (as far as I know) you are stuffed because MS Windows doesn't come with anything as useful (and basic) as diff and patch and it's not available for it. It's a unix tool. I could be wrong though - maybe someone has ported it to MS Windows, though I doubt it.

 

I recently found a unix emulator for windows, perhaps that's another option to follow .

Funny what people port nowadays, the emulation of my first computer (ZXspectrum) was ported to my phone :lol: it's about the same screen resolution

KEEP CALM AND CARRY ON

I do not use the responsive bootstrap version since i coded my responsive version earlier, but i have bought every 28d of code package to support burts effort and keep this forum alive (albeit more like on life support).

So if you are still here ? What are you waiting for ?!

 

Find the most frequent unique errors to fix:

grep "PHP" php_error_log.txt | sed "s/^.* PHP/PHP/g" |grep "line" |sort | uniq -c | sort -r > counterrors.txt

Link to comment
Share on other sites

I recently found a unix emulator for windows...

I suppose you could use 'Cygwin' - I use it every day. It works very well, but personally I've never understood the point - To me, if you want a unix environment then run unix !

 

But yes, it is an option.

 

Rich.

Link to comment
Share on other sites

I suppose you could use 'Cygwin' - I use it every day. It works very well, but personally I've never understood the point - To me, if you want a unix environment then run unix !

Or a Mac (OSX)? This is from the terminal window when executing "man patch" :

 

PATCH(1)

 

NAME

patch - apply a diff file to an original

 

SYNOPSIS

patch [options] [originalfile [patchfile]]

 

but usually just

 

patch -pnum <patchfile

 

DESCRIPTION

patch takes a patch file patchfile containing a difference listing pro-

duced by the diff program and applies those differences to one or more

original files, producing patched versions. Normally the patched ver-

sions are put in place of the originals. Backups can be made; see the

-b or --backup option. The names of the files to be patched are usu-

ally taken from the patch file, but if there's just one file to be

patched it can specified on the command line as originalfile.

 

Upon startup, patch attempts to determine the type of the diff listing,

unless overruled by a -c (--context), -e (--ed), -n (--normal), or -u

Link to comment
Share on other sites

Archived

This topic is now archived and is closed to further replies.

×
×
  • Create New...