Hello Constantin, On 09/15/2010 06:59 AM, Constantin Müller wrote: > I have some problem attaching the patches. > I used the SVN repository-sources of OpenSG. > > I have never worked with patches before so I tried to apply the last patch. > This did not work with svn (now I know it's because the patch is from git). > Therefore I had to apply the patch by hand. > This worked quite ok, but I'm very interested in how to apply it properly. > Today I tried to apply the 2nd patch. Therefore I installed Git and > cloned the http://www.cgmt.org/user/gerrit/OpenSG.git repo.
I'm not sure if Gerrit keeps that one up to date, please use the repos hosted at github: http://github.com/vossg/OpenSGDevMaster If you got the above one from the wiki I'd appreciate it if you could let us know which page we need to update, thanks! > I tried to apply the patch but this did not work. patches are independent of the VCS used, so applying one created by git diff to a subversion repository should not be a problem. > Could you explain me how I could apply the patch? using the program called patch (windows version: <http://gnuwin32.sourceforge.net/packages/patch.htm>): # go to toplevel directory in OpenSG source tree cd opensg.trunk # test if patch applies, without changing anything patch -p1 --dry-run <patch_to_apply.diff # apply patch patch -p1 <patch_to_apply.diff the -pN option removes N leading directories from the paths inside the patch, for a patch generated by git diff this means N=1, because the paths look like: a/Source/System/Window/FrameBufferObjects/OSGFrameBufferObject.cpp b/Source/System/Window/FrameBufferObjects/OSGFrameBufferObject.cpp (note the leading a/, b/), IIRC for patches generated with svn diff N=0. Cheers, Carsten ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Opensg-users mailing list Opensg-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensg-users
