http://drupal.org/node/23409 about *applying* patches on Windows is under the how-to for *creating patches*.

I think a more appropriate location would be as a child page of http://drupal.org/node/60179

Comments

heine’s picture

heine commented

The pages

- Diff on Windows http://drupal.org/node/324
- Patch on Windows http://drupal.org/node/23409

have to be incorporated under either Apply / Create patches in the correct format (one page per program), not just moved. Some pages can be deleted.

I feel it's best done by people who have actually used /tested the howto with the program.

venkat-rk’s picture

venkat-rk commented

You are right. I just submitted an issue about restructuring the handbook to separate *apply* from *create* and also have separate pages for each program.

I have installed and used Cygwin successfully to patch files, so I think I can handle that. Even otherwise, I feel I can redo the pages in a proper structure and someone more experienced can vet them before they are committed to the handbook.

sepeck’s picture

sepeck commented

actually, redo the pages, then we'll vet them. If we can;t make them work then we'll just remove them.

heine’s picture

heine commented

The apply patch part is done.

venkat-rk’s picture

venkat-rk commented

Thanks, Sepeck, I will.

heine’s picture

heine commented

Ramdak, can you compare the following with http://drupal.org/node/32875 and indicate what should be added to 32875?

  1. Get the latest version of Cygwin at Cygwin.com. What you download is actually a small setup file that will reconnect to the web for more data when executed.
  2. Run setup.exe. Chose "install from the internet", an appropriate directory, connection type etc. matching your system. In the next window, chose a server near to you (btw: no problem to cancel & restart with a different server, if the first choice is slow).
  3. In the next window you get a list of available packages - now it's important to add "patch" to the list, since it is not included by default. You have to find it by pressing the "view"-Button once to see all of the packages (view cycles between "category", "all" and "updated"). Scroll down until you see "patch" in the column "Packages". Klick the small Icon with the text "skip" way to the left in the line - "skip" will change to a version number. This means the package will be installed. (at this point you could also deactivate a whole bunch of the other packages, if you don't need them. If you don't, the setup-process takes a while.)
  4. Run cygwin. In the explorer, you will see that a unix-like directory-structure has been created inside the installation directory. when you run the program for the first time, a user-directory is created below the "home"-directory. This will be your default directory when working with cygwin - the easiest way is to put the original file & the patch there (so you don't have to enter a lengthy path to your commands).
  5. Patch! :) In the open shell (command window) just enter the command:
    patch -p0 original.filename nameofyour.patch
  6. If you get errors while patching, try to use the original file fresh from the drupal server. I used a module from my working server, and the patch command threw all kinds of errors. Seems as if the line-numbers have been messed up somehow by copying & viewing. Although I do not understand how this could happen.
  7. Before you copy the patched file to your server, rename the old one... you never know if it really works in your environment.
venkat-rk’s picture

venkat-rk commented

Heine, thanks, I will.

I think the apply patch page for cygwin you just moved (http://drupal.org/node/32875) has gone into the *create* patches section.

heine’s picture

heine commented

Thanks, fixed that.

venkat-rk’s picture

venkat-rk commented

Comparing the two pages, I feel http://drupal.org/node/32875 has the kind of detailed instructions and handholding that will make the process of installing easy for newbies. I remember that I was only able to install Cygwin properly because of that page, not the other one. The current revision might be just a bit heavy for newbies. Just a thought.

heine’s picture

heine commented

I had removed the text above in favor of http://drupal.org/node/32875, so that is the default page. As, if you say the text above doesn't add to the docs, I will delete it from the moderation queue.

heine’s picture

heine commented

http://drupal.org/node/324 contains a number of Visual diff programs. While useful to compare revisions, they do not all let one save patches. I will only keep the programs that can create patches. What remains, seems more a general CVS / TortoiseCVS & create patches, so I'll put a revision under Create patches on Windows in the format of the Subversion and TortoiseSVN entries.

venkat-rk’s picture

venkat-rk commented

Okay. I will come back with handbook pages that combine the best of the instructions on both the pages, plus redone book pages based on the structure I proposed in the other thread.

heine’s picture

heine commented

I'm currently working on moving & splitting http://drupal.org/node/324 to http://drupal.org/node/60234.

plus redone book pages based on the structure I proposed in the other thread.

Not sure what you mean by that, but see my comment in the other issue.

bdragon’s picture

bdragon commented
Status: Active » Closed (fixed)

The diff and patch section of the handbook has been redone, and that node doesn't even exist anymore.

Closing.