Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
Intergrate the nativeparser_base to our parsertest project
MortenMacFly:
--- Quote from: jens on July 07, 2012, 03:22:03 pm ---I also use git for my local repo and creating svn compatible patches needs just one more step: [...] or use the attached python script (if it works on windows).
--- End quote ---
Right... I'll try that but this becomes really annoying! I mean: Whats the point in pre-processing patches in a platform dependent way, if we can have proper patches done right using subversion? ::) ??? :-\
Jenna:
--- Quote from: MortenMacFly on July 07, 2012, 03:27:22 pm ---
--- Quote from: jens on July 07, 2012, 03:22:03 pm ---I also use git for my local repo and creating svn compatible patches needs just one more step: [...] or use the attached python script (if it works on windows).
--- End quote ---
Right... I'll try that but this becomes really annoying! I mean: Whats the point in pre-processing patches in a platform dependent way, if we can have proper patches done right using subversion? ::) ??? :-\
--- End quote ---
I use git for my local workspace, because it is more flexible, if I work with several patches, because I can easily create local branches.
And running one script after creating a patch to be applied on windows is not too much work for me.
On linux the git-created patches can be easily applied using the "patch" executable without any further processing.
oBFusCATed:
At work I use git-svn-diff script, it generates proper windows svn patches, but as far as I know it doesn't work on windows...
MortenMacFly:
--- Quote from: jens on July 07, 2012, 03:40:59 pm ---I use git for my local workspace, because it is more flexible,
--- End quote ---
Surely one can use locally whatever (s)he thinks is right. My point is: I would like to see that even if people use GIT or whatever locally that we post patches here created by svn diff. This will cause no hassle on all platforms - it just works. Everything else is a nightmare... at least on Windows.
Besides: Even after installing (updating) Python and running the script, applying the modified patch still doesn't work and errors with my favourite error message "chunk info expected". So I give up on this.
ollydbg:
--- Quote from: MortenMacFly on July 07, 2012, 11:05:54 am ---
--- Quote from: ollydbg on July 07, 2012, 04:33:00 am ---The patch is generated by git, but I think using the patch command under msys, it can directly apply the change on a SVN trunk.
--- End quote ---
Nope, doesn't work here. So I cannot try. Maybe you can do a proper svn diff-based patch. Its easy: just transfer the changes to the svn controlled folder and do a svn diff > patch in the root folder of Code::Blocks's sources.
--- End quote ---
Here it is.
It was created from the plugins folder.
BTW: I can still use the command :
patch -p1 < aaa.patch
to apply the patch (generated in git )on svs local copy.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version