creating a patch from cvs

specifically
I wanted to create a patch equal to the changes between two versions of
Drupal - but it turns out that a packaging script adds some info to
releases that isn’t in the cvs version so this doesn’t quite do what I
wanted.

it’s still useful though …

  • checkout the current version
  • generate the patch as a diff between the previos version and this one
  • optionally run a diff to compare the two versions (cvs and svn) to check they are the same

cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal checkout -d drupal5 -r DRUPAL-5-6 drupal

cd drupal
cvs diff -N -u -rDRUPAL-5-5 -r DRUPAL-5-6 > ../drupal-5-5-to-5-6.txt
cd ..
diff -r drupal-cvs/ drupal | grep -v .svn | grep -v CVS | less

In eclipse open the svn drupal project - go to teams - apply patch

and (except for the packaging stuff) you have an updated drupal for your svn repository.

Tags

Post new comment

Got something to add - just enter a comment
all other fields are optional.

Your email address will not be published.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>
  • Lines and paragraphs break automatically.

More information about formatting options

CAPTCHA
This question is for testing whether you are a human visitor and to prevent automated spam submissions.
Image CAPTCHA
Enter the characters shown in the image without spaces, also respect upper and lower case.