Hi guys, We want to experiment with some of the django development processes in our projects, too. So I tried to create .diff-files and merge them into another repository to keep my working trunk clean from patches and new features, that are not tested yet.
The creation of diff files is easy. I can understand "svn diff" very well. But after reading in the SVN Book, google and the "svn help" pages for svn commands I still don't know how to get this abc.diff into my working repository. So I started to experiment (in a test-repository ;) ): $ cat abc.diff | svn merge svn: Not enough arguments provided; ... $ svn merge --diff3-cmd `cat abc.diff` svn: invalid option: --- $ cat abc.diff | svn merge --diff3-cmd svn: missing argument: --diff3-cmd and so on... (tried some stuff with "svn up" and "svn ci" too) I'm sorry, that I can't find a solution myself. Can you provide a working way to do it? regards Erik Bernoth --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django users" group. To post to this group, send email to django-users@googlegroups.com To unsubscribe from this group, send email to django-users+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/django-users?hl=en -~----------~----~----~----~------~----~------~--~---
