Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
A Git Repository for Code::Blocks (ONLY trunk)
oBFusCATed:
Apply it with the patch command and then commit it in your local branch with patches.
daniloz:
--- Quote from: oBFusCATed on November 21, 2011, 10:11:38 am ---Apply it with the patch command and then commit it in your local branch with patches.
--- End quote ---
That's what I was trying to do, but I got the following error message
--- Code: ---can't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/sdk/editorconfigurationdlg.cpp
|===================================================================
|--- src/sdk/editorconfigurationdlg.cpp (revision 7595)
|+++ src/sdk/editorconfigurationdlg.cpp (working copy)
--------------------------
File to patch:
--- End code ---
That's my command
--- Code: ---$ patch -i /...path.../BraceCompletionSelectedText.patch
--- End code ---
Jenna:
--- Quote from: daniloz on November 21, 2011, 10:14:16 am ---
--- Quote from: oBFusCATed on November 21, 2011, 10:11:38 am ---Apply it with the patch command and then commit it in your local branch with patches.
--- End quote ---
That's what I was trying to do, but I got the following error message
--- Code: ---can't find file to patch at input line 5
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: src/sdk/editorconfigurationdlg.cpp
|===================================================================
|--- src/sdk/editorconfigurationdlg.cpp (revision 7595)
|+++ src/sdk/editorconfigurationdlg.cpp (working copy)
--------------------------
File to patch:
--- End code ---
That's my command
--- Code: ---$ patch -i /...path.../BraceCompletionSelectedText.patch
--- End code ---
--- End quote ---
If you are inside the git's root level, you need most likely the -p0 (or -p1) parameter, and I suggest to always use --dry-run as first to test what would happen, without breaking anything.
daniloz:
--- Quote from: jens on November 21, 2011, 10:24:46 am ---If you are inside the git's root level, you need most likely the -p0 (or -p1) parameter, and I suggest to always use --dry-run as first to test what would happen, without breaking anything.
--- End quote ---
Thanks jens, the switch -p0 did the trick and I could apply the patch...
ollydbg:
There is some new discussion of git. see:
Re: Integrate the nativeparser_base to our parsertest project
Said by Morten:
--- Quote ---I have nothing against GIT itself. Just the combination we do here between SVN and GIT. If we all agree we should consider moving towards GIT completely if most of the devs use it anyways. I recall we were discussing this already, just not why we didn't do it (was it the lack of support from BerliOS?!).
I wonder if some of you already did a migration from SVN to GIT. I mean in terms of keep existing branches and (of course) the whole history...?!
I recall the time when I personally migrated from CVS to SVN. It wasn't easy, but doable if you had the right tools at hand.
--- End quote ---
So, we can discuss this issue here.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version