On Wed, Jul 18, Rob Hudson wrote: > After going to a git presentation by Randal Schwartz and watching the > video by Linus on git, I decided to play with it some for a patch I'm > testing in Django. I got git and git-svn installed on my Mac, pulled > down the Django source and started a new branch for the patch I'm > working on.
Was git-svn easy to set up? I'm having issues with its ugly sibling "git-svnimport" ... > What I can't figure out is how to create a nice patch from git to > include into Trac. I tried "git format-patch master" but that outputs > something you'd send in an email. > > I also tried "git diff master" and while this is a lot closer it > prepends "a" and "b" to the to path trees. So you'd then have to use > "patch -p1 < mydiff", which may be what Trac does by default, I'm not > sure. > > Is anyone else doing this? Is there a better way to emit patches from > git? I use git-diff. Most times, the git patch just works. Sometimes, it doesn't, but removing the email part and the "index" lines helps. Sometimes, no matter what I do, trac doesn't understand a patch, then I just put in I comment about that. BTW, as soon as you start to use patches with django, you might want to look into one of the various patch management tools, such as "stgit" (google ...) and "patchy git" (http://www.spearce.org/category/projects/scm/pg/ --though it's unmaintained, I don't have any issues with it). Michael -- noris network AG - Deutschherrnstraße 15-19 - D-90429 Nürnberg - Tel +49-911-9352-0 - Fax +49-911-9352-100 http://www.noris.de - The IT-Outsourcing Company Vorstand: Ingo Kraupa (Vorsitzender), Joachim Astel, Hansjochen Klenk - Vorsitzender des Aufsichtsrats: Stefan Schnabel - AG Nürnberg HRB 17689 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-developers?hl=en -~----------~----~----~----~------~----~------~--~---
