Update: thanks to all the suggestions I was able to do this successfully. For the record, here is exactly what I did -- note that this was a simple example since the ticket #10973 had only one patch on it.
Starting in a freshly updated master branch: # create new branch and check it out: git checkout -b intpoints # pull in the patch from the ticket: ./sage -dev import-patch --url http://trac.sagemath.org/raw-attachment/ticket/10973/trac_10973_v8.patch # look at the last commit message: git log -1 # look at the diffs (i.e. the patch's contents): git diff HEAD^ # push the new branch onto trac (creating a new branch name there which is more informative than my local branch name): git push --set-upstream trac intpoints:u/cremona/trac10973intpts The last operation took quite a while (10 minutes?) That's all local to my machine. On the trac ticket, I filled in the Branch field and saved it and trac filled in the commit hash automatically. It also now lists the "last 10 new commits" in a comment, only one of which is relevant, but if you now click on the relvant hash (7f50362) it displays beautifully all the changes introduced by the commit, looking very much like and old-style view of a patch. Now all I have to do is work on the code until I am satisfied that it does what it should! I guess there is no need for me to have listed all the above in detail on sage-git. It might be helpful to others to forward to sage-devel. John On 18 December 2013 06:31, Andrew <[email protected]> wrote: > You may have seen it on the TentativeConventions page put up by > sage-ccmbinat after sage days 54. > Andrew > > > On Tuesday, 17 December 2013 21:29:05 UTC+1, John Cremona wrote: >> >> Could someone point me to the instructions for converting an old >> non-git ticket with mercurial patches to a new-style ticket where >> there's a git branch instead? I am sure that I read it somewhere but >> cannot find it. >> >> John > > -- > You received this message because you are subscribed to the Google Groups > "sage-git" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > > For more options, visit https://groups.google.com/groups/opt_out. -- You received this message because you are subscribed to the Google Groups "sage-git" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
