Patching freaks me out because it is so magical. So I keep these notes.

dr-charles-severances-powerbook-g4-15:~/dev/sakai csev$ patch < ~/Desktop/patch-SAK-3442a.diff can't find file to patch at input line 4 Perhaps you should have used the -p or --strip option? The text leading up to this was: -------------------------- |diff -ur /srv/svn/repos/branches/sakai_2-1-1/legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java |--- /srv/svn/repos/branches/sakai_2-1-1/legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java 2006-01-11 13:02:53.000000000 +0200 |+++ legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java 2006-01-29 13:22:10.000000000 +0200 -------------------------- File to patch: ^C dr-charles-severances-powerbook-g4-15:~/dev/sakai csev$ patch -p5 < ~/Desktop/patch-SAK-3442a.diff can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -ur /srv/svn/repos/branches/sakai_2-1-1/legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java |--- /srv/svn/repos/branches/sakai_2-1-1/legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java 2006-01-11 13:02:53.000000000 +0200 |+++ legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java 2006-01-29 13:22:10.000000000 +0200 -------------------------- File to patch: ^C dr-charles-severances-powerbook-g4-15:~/dev/sakai csev$ pwd /Users/csev/dev/sakai dr-charles-severances-powerbook-g4-15:~/dev/sakai csev$ patch -p6 < ~/Desktop/patch-SAK-3442a.diff patching file legacy/access/src/java/org/sakaiproject/tool/access/AccessServlet.java missing header for unified diff at line 123 of patch patching file legacy/component/project.xml Hunk #1 FAILED at 151. 1 out of 1 hunk FAILED -- saving rejects to file legacy/component/project.xml.rej patching file legacy/component/src/java/org/sakaiproject/component/legacy/content/BaseContentService.java Hunk #1 FAILED at 113. 1 out of 3 hunks FAILED -- saving rejects to file legacy/component/src/java/org/sakaiproject/component/legacy/content/BaseContentService.java.rej dr-charles-severances-powerbook-g4-15:~/dev/sakai csev$ vi legacy/component/project.xml.rej Notes from Stephen - use -p0 to chop off the slash. Next Steps - edit the .rej files and the real files and hand-apply the patches.