On Thu, Jul 1, 2010 at 12:25 PM, Mike Hansen <mhan...@gmail.com> wrote: > On Thu, Jul 1, 2010 at 12:05 PM, David Kirkby <david.kir...@onetel.net> wrote: >> I don't understand your proposal. Would it need the patch command >> added to Sage? I don't understand your method, so can't comment >> really. > > William's proposal is to > > 1) Standardize the filenames of patches so that the only file which > patches ./src/foo/bar/xyz.py is ./patches/foo/bar/xyz.py.patch > > 2) Only the .patch file is checked into the repository. > > 3) When doing "sage -spkg" to create an spkg, it goes through all of > the patches under ./patches/ and uses the patch command to make the > patched file which is copied over. In the above example, the "sage > -spkg" script would automatically make ./patches/foo/bar/xyz.py from > ./src/foo/bar/xyz.py and ./patches/foo/bar/xyz.py.patch. Thus, only > patch needs to be installed on the machine which creates the original > spkg. > > One issue that I have with the way things are done now which is not > addressed by William's proposal is that (logical) patches which touch > multiple files have to be broken up.
A slight modification of what you describe above addresses this. Just replace: "When doing "sage -spkg" to create an spkg, it goes through all of the patches under ./patches/ and uses the patch command to make the patched file which is copied over." by "When doing "sage -spkg" to create an spkg, it goes through all of the patches under ./patches/ and uses the patch command to make the patched FILES which are copied over." There is no reason that the patches under patches/ have to apply to only one file. -- William > Similarly, if two (logical > patches) touch the same file, then they have to be merged. If you > used the patch command, then things wouldn't have to be broken up by > file. > > --Mike > > -- > 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 > -- William Stein Professor of Mathematics University of Washington http://wstein.org -- 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
