Sorry, I had just created the ticket but not rebased on to develop. That got rid of all the untracked files (they are in gitignore) except for the last two. I don't know why they are present.
On Sunday, January 19, 2014 12:14:10 AM UTC+8, P Purkayastha wrote: > > In trying to import a patch, I ran across this problem: > > ~/Installations/sage» ./sage --dev import-patch --url " > http://trac.sagemath.org/raw-attachment/ticket/13576/trac_13576-add_options_to_points.patch > " > There are untracked files in your working directory: > aclocal.m4 > autom4te.cache/output.0 > autom4te.cache/output.1 > autom4te.cache/requests > autom4te.cache/traces.0 > autom4te.cache/traces.1 > build/Makefile-auto > build/Makefile-auto.in > config.log > config.status > config/config.guess > config/install-sh > config/missing > configure > src/doc/en/reference/diophantine_approximation/conf.py > src/doc/en/reference/diophantine_approximation/index.rst > The patch cannot be imported unless these files are removed. > > What would be a good way to fix this? Should I add them or delete them > from git? Maybe add them to gitignore? > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.
