Hi David, On Thu, Dec 31, 2009 at 4:54 AM, Dr. David Kirkby <david.kir...@onetel.net> wrote:
<SNIP> > (I normally tend to extract the file, then > increment the patch number, so I'd be editing > $SAGE_ROOT/spkg/standard/foobar-1.0.p0/spkg-install That sounds sensible. > Martin Albrecht added a patch for me to > > http://trac.sagemath.org/sage_trac/ticket/7505 > > which adds two new files > > $SAGE_ROOT/spkg/base/testcc.sh > $SAGE_ROOT/spkg/base/testcxx.sh > > I noticed the diff is relative to /dev/null That patch needs updating now. I'm > not sure the best way to do that. As you said on ticket #7505, your latest attachments "testcc.sh" and "testcxx.sh" are updated versions of previous attachments. I understand that Martin's patch "trac_7505.patch" is a patch file for your earlier test scripts. Now that you have attached newer versions of the test scripts, I think it's not necessary to also update Martin's patch. What you can do is create a new patch from your updated test scripts. Without using Mercurial, this can be done as follows: [mv...@t2 trac-7505]$ diff -u /dev/null testcc.sh > testcc.diff [mv...@t2 trac-7505]$ diff -u /dev/null testcxx.sh > testcxx.diff [mv...@t2 trac-7505]$ cat testcc.diff testcxx.diff > trac_7505-test-scripts.patch [mv...@t2 trac-7505]$ ls testcc.diff testcxx.sh testcc.sh trac_7505-test-scripts.patch testcxx.diff So you can now upload "trac_7505-test-scripts.patch" to the trac server. > There's nothing in the patch which would > suggest where the files go, though it is explained in the ticket, and the > reason > why. I see that you and Martin have agreed to place the test scripts under SAGE_ROOT/spkg/base Martin's patch was probably produced somewhere outside of the Sage directory tree. But I think that doesn't matter in this case. To apply a patch using "patch" and without using hg, you download the patch file to the relevant directory and use the "patch" command. I admit that doing something like this patch < trac_7505.patch is OK under Linux. But on Solaris, I have trouble using "patch" as the above command is more chatty. It's a common experience, I think, of people like myself who are transitioning to using non-GNU tools on Unix. -- Regards Minh Van Nguyen -- To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
